Commit 9e47ae4c authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix local install targets to account for non-empty DESTDIR.

parent 848d1c69
...@@ -126,5 +126,10 @@ CLEANFILES += $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi. ...@@ -126,5 +126,10 @@ CLEANFILES += $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.
endif endif
install-exec-local: pkgconfig/cdi.pc install-exec-local: pkgconfig/cdi.pc
$(mkinstalldirs) $(libdir)/pkgconfig $(mkinstalldirs) "$(DESTDIR)$(libdir)/pkgconfig"
$(install_sh_DATA) pkgconfig/cdi.pc $(libdir)/pkgconfig/ $(install_sh_DATA) pkgconfig/cdi.pc "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
uninstall-local:
rm -f "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
rmdir "$(DESTDIR)$(libdir)/pkgconfig"
...@@ -750,7 +750,8 @@ ps: ps-am ...@@ -750,7 +750,8 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-local
.MAKE: all install-am install-strip .MAKE: all install-am install-strip
...@@ -768,7 +769,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES ...@@ -768,7 +769,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
installdirs maintainer-clean maintainer-clean-generic \ installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-includeHEADERS uninstall-libLTLIBRARIES uninstall-am uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-local
#libcdi_la_CPPFLAGS = @CPPFLAGS@ #libcdi_la_CPPFLAGS = @CPPFLAGS@
...@@ -795,8 +797,15 @@ pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status ...@@ -795,8 +797,15 @@ pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
all-local: $(LOCALTARGETS) all-local: $(LOCALTARGETS)
install-exec-local: pkgconfig/cdi.pc install-exec-local: pkgconfig/cdi.pc
$(mkinstalldirs) $(libdir)/pkgconfig -ls -la "$(DESTDIR)$(libdir)/pkgconfig"
$(install_sh_DATA) pkgconfig/cdi.pc $(libdir)/pkgconfig/ $(mkinstalldirs) "$(DESTDIR)$(libdir)/pkgconfig"
-ls -la "$(DESTDIR)$(libdir)/pkgconfig"
$(install_sh_DATA) pkgconfig/cdi.pc "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
-ls -la "$(DESTDIR)$(libdir)/pkgconfig"
uninstall-local:
rm -f "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
rmdir "$(DESTDIR)$(libdir)/pkgconfig"
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
......
Supports Markdown
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