store -arch switches in an ARCHS var

diff --git a/macosx/prebuild/Makefile.leopard b/macosx/prebuild/Makefile.leopard
index 7fc589a1bbeaf7dce60dfadf787a1c739efc8ae4..14196eb44ac56e3d7fbfb002e70b26f5499fb70f 100644 (file)
--- a/macosx/prebuild/Makefile.leopard
+++ b/macosx/prebuild/Makefile.leopard
@@ -6,6 +6,8 @@ TAR=tar
 
 PREFIX=$(HOME)/FIX/leopard
 
+ARCHS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
+
 # package URL
 
 PKGCONFIG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz
@@ -54,7 +56,7 @@ PANGO_DIR=$(call dirname, $(PANGO_URL))
 # pkgconfig to look for X11 libraries too
 
 BASE_CONFIG=--prefix=$(PREFIX) --disable-dependency-tracking --enable-static=yes --enable-shared=no PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig"
-FLAG_CONFIG=CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -arch x86_64" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" 
+FLAG_CONFIG=CFLAGS="-O2 $(ARCHS)" LDFLAGS="$(ARCHS)" 
 
 install: $(PREFIX)/lib/$(PANGO) $(PREFIX)/lib/$(GD)
 
@@ -188,7 +190,7 @@ $(GLIB_DIR)/Makefile: $(PREFIX)/lib/$(INTL) | $(PREFIX)/bin/$(PKGCONFIG) $(GLIB_
        cp glibconfig.h glibconfig.x86_64.h && \
        cp darwin.cache darwinian.cache && \
        echo --- UNIVERSAL BINARY PASS --- && \
-       ./configure $(BASE_CONFIG) CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64 -L$(PREFIX)/lib" && \
+       ./configure $(BASE_CONFIG) CFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" LDFLAGS="$(ARCHS) -L$(PREFIX)/lib" && \
        rm config.h && \
        echo "#if defined(__ppc__)" >>config.h && \
        cat config.ppc.h >>config.h && \
@@ -319,7 +321,7 @@ $(PIXMAN_DIR)/Makefile: | $(PREFIX)/bin/$(PKGCONFIG) $(PIXMAN_DIR)/configure
        @echo
        @echo CONFIGURING PIXMAN...
        @echo
-       cd $(PIXMAN_DIR) && ./configure $(BASE_CONFIG) CFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64"
+       cd $(PIXMAN_DIR) && ./configure $(BASE_CONFIG) CFLAGS="$(ARCHS)" LDFLAGS="$(ARCHS)"
        
 $(PIXMAN_DIR)/configure: | $(PIXMAN_DIR).tar.gz
        @echo