[Xquartz-changes] [508] trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 4 15:17:03 PST 2011


Revision: 508
          http://trac.macosforge.org/projects/xquartz/changeset/508
Author:   jeremyhu at freedesktop.org
Date:     2011-03-04 15:17:03 -0800 (Fri, 04 Mar 2011)
Log Message:
-----------
Workaround sudo $HOME issue and build quartz-wm for all to ensure it has an i386 slice

Modified Paths:
--------------
    trunk/compile-xserver.sh
    trunk/mk_x11_dist.sh

Modified: trunk/compile-xserver.sh
===================================================================
--- trunk/compile-xserver.sh	2011-03-04 23:14:49 UTC (rev 507)
+++ trunk/compile-xserver.sh	2011-03-04 23:17:03 UTC (rev 508)
@@ -15,11 +15,11 @@
  
 . ~/src/strip.sh
 
-#PREFIX=/usr/X11
+PREFIX=/usr/X11
 #ARCHFLAGS="-arch i386 -arch ppc"
 
-PREFIX=/opt/X11
-CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
+#PREFIX=/opt/X11
+#CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
 ARCHFLAGS="-arch i386 -arch x86_64"
 
 ACLOCAL="aclocal -I ${PREFIX}/share/aclocal -I /usr/local/share/aclocal"

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2011-03-04 23:14:49 UTC (rev 507)
+++ trunk/mk_x11_dist.sh	2011-03-04 23:17:03 UTC (rev 508)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ~/src/strip.sh
+. ~jeremy/src/strip.sh
 
 unset CFLAGS OBJCFLAGS CPPFLAGS LDFLAGS C_INCLUDE_PATH OBJC_INCLUDE_PATH CPLUS_INCLUDE_PATH PKG_CONFIG_PATH
 
@@ -148,7 +148,7 @@
 [[ -n ${X11MISC} && -d X11misc/${X11MISC} ]]          && bit X11misc/${X11MISC}        -project X11misc       ${ARCH_ALL}
 [[ -n ${X11PROTO} && -d X11proto/${X11PROTO} ]]       && bit X11proto/${X11PROTO}      -project X11proto      ${ARCH_ALL}
 [[ -n ${X11LIBS} && -d X11libs/${X11LIBS} ]]          && bit X11libs/${X11LIBS}        -project X11libs       ${ARCH_ALL}
-[[ -n ${QUARTZWM} && -d X11_quartz_wm/${QUARTZWM} ]]  && bit X11_quartz_wm/${QUARTZWM} -project X11_quartz_wm ${ARCH_EXEC}
+[[ -n ${QUARTZWM} && -d X11_quartz_wm/${QUARTZWM} ]]  && bit X11_quartz_wm/${QUARTZWM} -project X11_quartz_wm ${ARCH_ALL}
 [[ -n ${X11SERVER} && -d X11server/${X11SERVER} ]]    && bit X11server/${X11SERVER}    -project X11server     ${ARCH_ALL}
 [[ -n ${X11APPS} && -d X11apps/${X11APPS} ]]          && bit X11apps/${X11APPS}        -project X11apps       ${ARCH_ALL}
 [[ -n ${X11FONTS} && -d X11fonts/${X11FONTS} ]]       && bit X11fonts/${X11FONTS}      -project X11fonts      ${ARCH_ALL}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110304/99909184/attachment.html>


More information about the Xquartz-changes mailing list