Commit f2e68277 authored by sven.panne@aedion.de's avatar sven.panne@aedion.de
Browse files

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

MERGE TO STABLE
parent 10826f44
......@@ -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)"
......@@ -123,19 +123,6 @@ show-install :
@echo "headerdir = $(headerdir)"
@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
#
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment