[gnome-commander/gcmd-1-6] Revert "Fixes use of DESTDIR variable while (un)installing with make"



commit 362199d3a38eb1395cc72e636ce568b5d37ed972
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun May 28 19:49:17 2017 +0200

    Revert "Fixes use of DESTDIR variable while (un)installing with make"

 data/Makefile.am |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 022e110..4ab11ea 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -45,13 +45,17 @@ DISTCLEANFILES = $(appdata_DATA) $(desktop_DATA)
 
 HAVE_UPDATE_MIME_DATABASE = @HAVE_UPDATE_MIME_DATABASE@
 
+#
+# Keep in mind: Although $DESTDIR is often empty, it is needed
+# for 'make distcheck' so leave it here, please!
+#
 install-data-hook:
        test "x$(HAVE_UPDATE_MIME_DATABASE)" == "xyes" && \
-               update-mime-database -V $(mimetopdir)
+               update-mime-database -V $(DESTDIR)/$(mimetopdir)
 
 uninstall-hook:
-       for target in $(mimetopdir)/* ; \
-               do test "x$${target}" != "x$(mimexmldir)" && rm -rf $${target} ; done
+       for target in $(DESTDIR)/$(mimetopdir)/* ; \
+               do test "x$${target}" != "x$(DESTDIR)/$(mimexmldir)" && rm -rf $${target} ; done
 
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]