[gnome-commander] Reverts "Fixes use of DESTDIR variable while (un)installing with make"
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Reverts "Fixes use of DESTDIR variable while (un)installing with make"
- Date: Sun, 28 May 2017 20:40:10 +0000 (UTC)
commit 97eac6a884352bd0191ea6546bc1e61dd3723c91
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sun May 28 19:49:17 2017 +0200
Reverts "Fixes use of DESTDIR variable while (un)installing with make"
This is needed for 'make distcheck' when releasing a new version.
data/Makefile.am | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 97c6de9..3562e8a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -47,12 +47,16 @@ 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]