aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-07-07 16:58:33 +0000
committerJason Woodward2005-07-07 16:58:33 +0000
commita68074ce3e6c70340235b556216fc79d3fe96bd2 (patch)
treeba40852fc81ca2e23435945773e70f5bc22ec859
parent49667e8227212a8f3855081edf4e2807be72c27c (diff)
downloadgslapt-a68074ce3e6c70340235b556216fc79d3fe96bd2.tar.gz
updated pkg target to follow PKGDIR if set, or ./pkg/ by default
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.am24
2 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ae8302..15764ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.3.4 July 07, 2005
+ * updated pkg target to follow PKGDIR if set, or ./pkg/ by default
* use AC_CANONICAL_HOST for arch detection in configure.in
* disable unmark all menu option if nothing is currently marked
* when unmarking upgrades, make sure to reset the installed packages status
diff --git a/Makefile.am b/Makefile.am
index e50422d..0418d76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
SUBDIRS = src po
+PKGDIR := `pwd`/pkg
+
EXTRA_DIST = \
autogen.sh \
gslapt.glade \
@@ -35,15 +37,15 @@ dist-hook:
fi
pkg: all
- @make install DESTDIR=`pwd`/pkg
- $(mkinstalldirs) pkg/install
- install slack-desc pkg/install/
- install slack-required pkg/install/
- -chown root:bin pkg/$(sbindir)
- -chown root:bin pkg/$(sbindir)/@PACKAGE@
- @echo -n DESKTOPFILE= > pkg/install/doinst.sh
- @echo "$(DESTDIR)/$(datadir)/applications/gslapt.desktop" |sed -re "s/^\/+//" >> pkg/install/doinst.sh
- @echo 'if [ -f $$DESKTOPFILE ]; then if [ -x usr/bin/gksudo ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gksudo \2/" $$DESKTOPFILE; elif [ -x usr/bin/gksu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gksu \2/" $$DESKTOPFILE; elif [ -x usr/bin/gnomesu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gnomesu \2/" $$DESKTOPFILE; elif [ -x usr/bin/kdesu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1kdesu \2/" $$DESKTOPFILE; fi; fi' >> pkg/install/doinst.sh
- strip --strip-unneeded pkg/$(sbindir)/@PACKAGE@
- ( cd pkg && /sbin/makepkg -l y -c n @PACKAGE@-@VERSION@-@host_cpu@-1.tgz )
+ @make install DESTDIR=$(PKGDIR)
+ $(mkinstalldirs) $(PKGDIR)/install
+ install slack-desc $(PKGDIR)/install/
+ install slack-required $(PKGDIR)/install/
+ -chown root:bin $(PKGDIR)/$(sbindir)
+ -chown root:bin $(PKGDIR)/$(sbindir)/@PACKAGE@
+ @echo -n DESKTOPFILE= > $(PKGDIR)/install/doinst.sh
+ @echo "$(DESTDIR)/$(datadir)/applications/gslapt.desktop" |sed -re "s/^\/+//" >> $(PKGDIR)/install/doinst.sh
+ @echo 'if [ -f $$DESKTOPFILE ]; then if [ -x usr/bin/gksudo ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gksudo \2/" $$DESKTOPFILE; elif [ -x usr/bin/gksu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gksu \2/" $$DESKTOPFILE; elif [ -x usr/bin/gnomesu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1gnomesu \2/" $$DESKTOPFILE; elif [ -x usr/bin/kdesu ]; then sed -i.bak -re "s/(Exec=)(\/usr\/sbin\/gslapt)/\1kdesu \2/" $$DESKTOPFILE; fi; fi' >> $(PKGDIR)/install/doinst.sh
+ strip --strip-unneeded $(PKGDIR)/$(sbindir)/@PACKAGE@
+ ( cd $(PKGDIR) && /sbin/makepkg -l y -c n @PACKAGE@-@VERSION@-@host_cpu@-1.tgz )