From 816d837d98f31a51bacc3a5c17fe40e1b7abe98b Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 19 Dec 2005 02:03:49 +0000
Subject: [PATCH] (local-uninstall): idem.

---
 stepmake/stepmake/generic-targets.make         |  7 +++----
 stepmake/stepmake/install-library-targets.make | 12 ++++++------
 stepmake/stepmake/install-targets.make         |  6 +++---
 stepmake/stepmake/omf-targets.make             |  4 ++--
 stepmake/stepmake/texinfo-vars.make            |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index e3cbc6ec01..a196a357bc 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -112,7 +112,7 @@ local-distclean:
 local-maintainerclean:
 
 install-strip:
-	$(MAKE) INSTALL="$(INSTALL) -s" install
+	$(MAKE) INSTALLPY="$(INSTALLPY) -s" install
 
 ifeq ($(strip $(depth)),.)
 final-install:
@@ -132,9 +132,8 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-	-$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
-	$(foreach i, $(EXTRA_DOC_FILES),\
-		cp -r $(i) $(prefix)/doc/$(package) &&) true
+	-$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
+	cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package) 
 
 include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make
index fac40229f7..2662fbe3b1 100644
--- a/stepmake/stepmake/install-library-targets.make
+++ b/stepmake/stepmake/install-library-targets.make
@@ -1,17 +1,17 @@
 
 local-install: $(LIBRARY)
 ifneq ($(strip $(INSTALL_HEADERS)),)
-	$(INSTALL) -d $(DESTDIR)$(includedir)
-	$(INSTALL) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
+	$(INSTALLPY) -d $(DESTDIR)$(includedir)
+	$(INSTALLPY) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
 endif
 ifeq ($(LIB_SUFFIX),.so)
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY).$(VERSION)
+	$(INSTALLPY) -d $(DESTDIR)$(libdir)
+	$(INSTALLPY) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY).$(VERSION)
 	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
 	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
 else
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
+	$(INSTALLPY) -d $(DESTDIR)$(libdir)
+	$(INSTALLPY) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
 endif
 
 local-uninstall:
diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 394270b3c9..efa1273aff 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,12 +6,12 @@ local-install-outfiles:
 # urg, parameterise
 local-install-files: $(INSTALLATION_FILES)
 	$(PRE_INSTALL)
-	-$(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR)
+	-$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR)
 	$(INSTALLPY) -m 644 $(addprefix $(src-dir)/,$(INSTALLATION_FILES)) $(DESTDIR)$(INSTALLATION_DIR)/
 
 	$(foreach suff, $(INSTALLATION_SUFFIXES),  \
-		($(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
-		$(INSTALL) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ ) 
+		($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
+		$(INSTALLPY) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ ) 
 	$(POST_INSTALL)
 
 local-uninstall: local-uninstall-outfiles local-uninstall-files 
diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index eea2b7047b..59bf6218fd 100644
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -4,8 +4,8 @@ omf: $(OMF_FILES)
 local-install: omf-local-install
 
 omf-local-install: $(OMF_FILES)
-	-$(INSTALL) -d $(DESTDIR)$(local_package_omfdir)
-	$(foreach a, $(OMF_FILES), $(INSTALL) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
+	-$(INSTALLPY) -d $(DESTDIR)$(local_package_omfdir)
+	$(foreach a, $(OMF_FILES), $(INSTALLPY) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
 	@echo "Run scrollkeeper-update to register newly installed OMF files."
 
 local-uninstall: omf-local-uninstall
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index aa7e1a8239..30451cef6f 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -17,7 +17,7 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM)  --enable-encoding
 # info stuff
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
 INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
-	$(INSTALL) -d $(DESTDIR)$(package_infodir) ; \
+	$(INSTALLPY) -d $(DESTDIR)$(package_infodir) ; \
 	$(MAKE) INSTALLATION_OUT_DIR=$(package_infodir) \
 		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
 		-f $(stepdir)/install-out.sub.make,true)
-- 
2.39.5