aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-07-07 06:17:22 +0000
committerJason Woodward2005-07-07 06:17:22 +0000
commit49667e8227212a8f3855081edf4e2807be72c27c (patch)
tree2985ea99728f9c8e30d27b60847bf3a8584aca51
parentb8a10bffc75b8ea427434433e36dbbfea8e96399 (diff)
downloadgslapt-49667e8227212a8f3855081edf4e2807be72c27c.tar.gz
use AC_CANONICAL_HOST for arch detection in configure.in
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.am2
-rw-r--r--configure.in7
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de7657c..5ae8302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.3.4 July 07, 2005
+ * 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
icon as well
diff --git a/Makefile.am b/Makefile.am
index d92b3a6..e50422d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,5 +45,5 @@ pkg: all
@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@-i386-1.tgz )
+ ( cd pkg && /sbin/makepkg -l y -c n @PACKAGE@-@VERSION@-@host_cpu@-1.tgz )
diff --git a/configure.in b/configure.in
index 8c6a64e..c0fd8f5 100644
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,13 @@ AM_INIT_AUTOMAKE(gslapt, 0.3.4)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
+AC_CANONICAL_HOST
+
+case "$host_cpu" in
+i[[3456]]86) host_cpu=i386 ;CFLAGS="$CFLAGS -fpic";;
+x86_64) host_cpu=x86_64 ;CFLAGS="$CFLAGS -fPIC";;
+esac
+
AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_STDC