Removed install-dirs target, it is unnecessary and leads to stray empty directories

MERGE TO STABLE

diff --git a/mk/install.mk b/mk/install.mk
index a55b89d..9ad3d2f 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -111,7 +111,7 @@ endif # LINK
 # friends can be overridden from their original settings in mk/config.mk.in
 # || mk/build.mk
 #
-.PHONY: install install-docs installdirs install-strip install-dirs install-docs show-install
+.PHONY: install install-docs installdirs install-strip install-docs show-install
 
 show-install :
        @echo "DESTDIR = $(DESTDIR)"
@@ -124,19 +124,6 @@ show-install :
        @echo "includedir = $(includedir)"
 
 #
-# Sometimes useful to separate out the creation of install directories 
-# from the installation itself.
-#
-install-dirs ::
-       $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_DIR) $(DESTDIR)$(libdir)
-       $(INSTALL_DIR) $(DESTDIR)$(libexecdir)
-       $(INSTALL_DIR) $(DESTDIR)$(datadir)
-
-# Better do this first...
-install:: install-dirs
-
-#
 # Setting user/group ownership for the installed entities
 #
 ifneq "$(INSTALL_OWNER)" ""

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index d456750..3f3d374 100644 (file)
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -81,6 +81,7 @@ LINK = ghc-pkg
 LINK_TARGET = $(LINK)-$(ProjectVersion)
 INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET)
 install::
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
        $(RM) -f $(INSTALLED_SCRIPT)
        echo "#!$(SHELL)"                                           >> $(INSTALLED_SCRIPT)
        echo "GHCPKGBIN=$(libexecdir)/$(HS_PROG)"                   >> $(INSTALLED_SCRIPT)