--- Makefile.in.orig	Sat Oct 10 08:28:05 1998
+++ Makefile.in	Tue Nov  9 03:55:51 1999
@@ -7,6 +7,7 @@
 
 INSTALL= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 #LIBEFENCE = -lefence
 
@@ -26,7 +27,7 @@
 MANDIR=$(prefix)/man/man8
 LIBDIR=$(libdir)
 INCDIR=$(prefix)/include/rpm
-ETCDIR=$(ROOT)/etc
+ETCDIR=$(prefix)/etc
 
 # -----------------------------------------------------------------------
 
@@ -122,22 +123,21 @@
 	[ -d $(installprefix)/$(RPMCONFIGDIR) ] ||  \
 		$(mkinstalldirs) $(installprefix)/$(RPMCONFIGDIR)
 	if [ -x ./rpm ]; then \
-	    $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \
+	    $(INSTALL_PROGRAM) rpm $(installprefix)/$(RPMBINDIR); \
 	else \
-	    $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
+	    $(INSTALL_PROGRAM) rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
 	fi
-	$(INSTALL_PROGRAM) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
-	$(INSTALL_PROGRAM) -m 755 $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs
-	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides
-	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires
-	$(INSTALL_PROGRAM) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
-	$(INSTALL_DATA) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
-	$(INSTALL_DATA) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
-	$(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
-	$(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
-	(cd $(installprefix)/$(LIBDIR); rm -f rpmrc; ln -s $(RPMCONFIGDIR)/rpmrc rpmrc)
-	(cd $(installprefix)/$(LIBDIR); rm -f rpmpopt; ln -s $(RPMCONFIGDIR)/rpmpopt rpmpopt)
-	(cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
+	$(INSTALL_SCRIPT) $(srcdir)/gendiff $(installprefix)/$(BINDIR)
+	$(INSTALL_SCRIPT) $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs
+	$(INSTALL_SCRIPT) $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides
+	$(INSTALL_SCRIPT) $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires
+	$(INSTALL_PROGRAM) rpm2cpio $(installprefix)/$(BINDIR)
+	$(INSTALL_DATA) $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
+	$(INSTALL_DATA) $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
+	$(INSTALL_DATA) $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
+	$(INSTALL_DATA) $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
+	(cd $(installprefix)/$(ETCDIR); rm -f rpmrc; ln -s $(RPMCONFIGDIR)/rpmrc rpmrc)
+	(cd $(installprefix)/$(ETCDIR); rm -f rpmpopt; ln -s $(RPMCONFIGDIR)/rpmpopt rpmpopt)
 	for d in $(INSTSUBDIRS); do \
 		(cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\
 	done
