X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-targets.make;h=a202bea7b976986c49d2f21a4af7c8d8ebb4cbe6;hb=74ef2b1c90d1b9bd0e40fbcfc4efd53c16770cbd;hp=245b2e6c629d8296776af10fde966aac84b4efcb;hpb=c3f02f0948bbb78495ae3651fd42eea58319c40c;p=lilypond.git

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index 245b2e6c62..a202bea7b9 100644
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -31,12 +31,12 @@ ifeq ($(out),www)
 # This builds all .info targets with images, in out-www.
 # Viewable with a recent Emacs, doing: C-u C-h i out-www/lilypond.info
 
-local-install-info: info
-	-$(INSTALL) -d $(DESTDIR)$(infodir)
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## Can not have absolute symlinks because some binary packages build schemes
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
+local-install-info: info
+	-$(INSTALL) -d $(DESTDIR)$(infodir)
 	@echo
 	@echo "***************************************************************"
 	@echo "Please add or update the LilyPond direntries, do"
@@ -48,16 +48,23 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 	@echo "    (cd $(infodir) && ln -sfT ../doc/lilypond/html/$(DEST_INFO_IMAGES_SUBDIR) $(INFO_IMAGES_DIR))"
 	@echo "or add something like that to the postinstall script."
 	@echo
+
+local-uninstall-info:
+	-rmdir $(DESTDIR)$(infodir)
+
 else # installing directly into standard /usr/...
+local-install-info: info
 	-$(INSTALL) -d $(DESTDIR)$(infodir)
 	$(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
 	install-info --info-dir=$(infodir) $(outdir)/$(MAIN_INFO_DOC).info
 	cd $(infodir) && ln -sfT $(webdir)/$(DEST_INFO_IMAGES_SUBDIR) $(INFO_IMAGES_DIR)
-endif # installing directly into standard /usr/...
 
-local-uninstall-WWW:
+local-uninstall-info:
+	$(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
 	rm -f $(infodir)/$(INFO_IMAGES_DIR)
 
+endif # installing directly into standard /usr/...
+
 else # out!=www
 
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
@@ -65,7 +72,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
 local-install-info: info
-	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
+	-$(INSTALL) -d $(DESTDIR)$(infodir)
 	@echo
 	@echo "***************************************************************"
 	@echo "Please add or update the LilyPond direntries, do"
@@ -80,11 +87,10 @@ local-install-info: info
 	@echo
 
 local-uninstall-info:
-	-rmdir $(DESTDIR)$(package_infodir)
+	-rmdir $(DESTDIR)$(infodir)
 
 else # installing directly into standard /usr/...
 local-install-info: info
-	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
 	-$(INSTALL) -d $(DESTDIR)$(infodir)
 	$(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
 	install-info --info-dir=$(infodir) $(outdir)/$(MAIN_INFO_DOC).info
@@ -97,8 +103,6 @@ local-install-info: info
 
 local-uninstall-info:
 	$(foreach f,$(INFO_FILES),install-info --remove --info-dir=$(infodir) $(f) ; )true
-	-rmdir $(DESTDIR)$(infodir)
-	-rmdir $(DESTDIR)$(package_infodir)
 
 endif # installing into standard /usr/* root