|
 |
a66d456 |
From 1147a5bfa2283df5b98df01c6174203b801e04ea Mon Sep 17 00:00:00 2001
|
|
|
a66d456 |
From: dghart <dghart@users.sourceforge.net>
|
|
|
a66d456 |
Date: Fri, 19 Dec 2014 12:34:08 +0000
|
|
|
a66d456 |
Subject: [PATCH 4/4] Correct the use of DESTDIR in the last commit
|
|
|
a66d456 |
|
|
|
a66d456 |
---
|
|
|
a66d456 |
.build/4Pane.bkl | 17 +++++++++--------
|
|
|
a66d456 |
Makefile.in | 5 +++--
|
|
|
a66d456 |
2 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
a66d456 |
|
|
|
a66d456 |
diff --git a/.build/4Pane.bkl b/.build/4Pane.bkl
|
|
|
a66d456 |
index 8b184da..f018318 100755
|
|
|
a66d456 |
--- a/.build/4Pane.bkl
|
|
|
a66d456 |
+++ b/.build/4Pane.bkl
|
|
|
a66d456 |
@@ -136,9 +136,9 @@
|
|
|
a66d456 |
|
|
|
a66d456 |
|
|
|
a66d456 |
|
|
|
a66d456 |
- <fragment format="autoconf">ifneq ($(BZIP2_FLAGS),-DUSE_SYSTEM_BZIP2)</fragment>
|
|
|
a66d456 |
- <sources>$(fileList(['sdk/bzip/*.c']))</sources>
|
|
|
a66d456 |
- <fragment format="autoconf">endif</fragment>
|
|
|
a66d456 |
+ <fragment format="autoconf">ifneq ($(BZIP2_FLAGS),-DUSE_SYSTEM_BZIP2)</fragment>
|
|
|
a66d456 |
+ <sources>$(fileList(['sdk/bzip/*.c']))</sources>
|
|
|
a66d456 |
+ <fragment format="autoconf">endif</fragment>
|
|
|
a66d456 |
|
|
|
a66d456 |
|
|
|
a66d456 |
<cond-install-to>$(BINDIR)</cond-install-to>
|
|
|
a66d456 |
@@ -156,7 +156,8 @@
|
|
|
a66d456 |
|
|
|
a66d456 |
<command>
|
|
|
a66d456 |
@if test -d /usr/share/appdata/ ; then \
|
|
|
a66d456 |
- cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
|
|
|
a66d456 |
+ $(INSTALL_DIR) $(DESTDIR)/usr/share/appdata/ ;\
|
|
|
a66d456 |
+ cp 4Pane.appdata.xml $(DESTDIR)/usr/share/appdata/ ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
</command>
|
|
|
a66d456 |
|
|
|
a66d456 |
@@ -177,10 +178,10 @@
|
|
|
a66d456 |
rm -f $(DESTDIR)$(BINDIR)/4pane ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
</command>
|
|
|
a66d456 |
- <command>
|
|
|
a66d456 |
- @rm -f /usr/share/appdata/4Pane.appdata.xml ;
|
|
|
a66d456 |
- </command>
|
|
|
a66d456 |
- <command>
|
|
|
a66d456 |
+ <command>
|
|
|
a66d456 |
+ @rm -f $(DESTDIR)/usr/share/appdata/4Pane.appdata.xml ;
|
|
|
a66d456 |
+ </command>
|
|
|
a66d456 |
+ <command>
|
|
|
a66d456 |
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
|
|
|
a66d456 |
rm -f ~/Desktop/4Pane.desktop ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
a66d456 |
index 19ae920..c11e531 100644
|
|
|
a66d456 |
--- a/Makefile.in
|
|
|
a66d456 |
+++ b/Makefile.in
|
|
|
a66d456 |
@@ -107,7 +107,8 @@ install: install_4Pane
|
|
|
a66d456 |
ln -fs 4Pane $(DESTDIR)$(bindir)/4pane ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
@if test -d /usr/share/appdata/ ; then \
|
|
|
a66d456 |
- cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
|
|
|
a66d456 |
+ $(INSTALL_DIR) $(DESTDIR)/usr/share/appdata/ ;\
|
|
|
a66d456 |
+ cp 4Pane.appdata.xml $(DESTDIR)/usr/share/appdata/ ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
@if test $(desktop) = yes || test $(desktop) = install_only ; then \
|
|
|
a66d456 |
if test -d ~/Desktop/ ; then \
|
|
|
a66d456 |
@@ -145,7 +146,7 @@ uninstall: uninstall_4Pane
|
|
|
a66d456 |
@if test $(symlink) = yes || test $(symlink) = uninstall_only; then \
|
|
|
a66d456 |
rm -f $(DESTDIR)$(bindir)/4pane ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
- @rm -f /usr/share/appdata/4Pane.appdata.xml ;
|
|
|
a66d456 |
+ @rm -f $(DESTDIR)/usr/share/appdata/4Pane.appdata.xml ;
|
|
|
a66d456 |
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
|
|
|
a66d456 |
rm -f ~/Desktop/4Pane.desktop ;\
|
|
|
a66d456 |
fi;
|
|
|
a66d456 |
--
|
|
|
a66d456 |
2.1.0
|
|
|
a66d456 |
|