[GRASS-SVN] r46221 - grass/branches/develbranch_6/scripts/g.extension

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2011-05-09 07:14:19 -0700 (Mon, 09 May 2011)
New Revision: 46221

Modified:
   grass/branches/develbranch_6/scripts/g.extension/g.extension
Log:
partial fix for build when missing source (#854)

Modified: grass/branches/develbranch_6/scripts/g.extension/g.extension
===================================================================
--- grass/branches/develbranch_6/scripts/g.extension/g.extension	2011-05-09 14:12:35 UTC (rev 46220)
+++ grass/branches/develbranch_6/scripts/g.extension/g.extension	2011-05-09 14:14:19 UTC (rev 46221)
@@ -271,7 +271,7 @@
 
 cd "$TMPDIR/$MODULE"
 g.message message="Compiling <$MODULE>..."
-make MODULE_TOPDIR="$GISBASE"
+make MODULE_TOPDIR="$GISBASE" ARCH_INC="-I$GISBASE/include -I${MYINST_DIR}/include -I$TMPDIR/dist/include" ARCH_LIBPATH="-L$GISBASE/lib -L${MYINST_DIR}/lib -L$TMPDIR/dist/lib" ARCH_LIBDIR="$GISBASE/lib" ARCH_DISTDIR="$TMPDIR/dist"
 if [ $? -ne 0 ] ; then
    g.message -e message="Compilation failed, sorry. Please check above error messages."
    cleanup
@@ -305,12 +305,12 @@
          su -c "rm -f \"${MYINST_DIR}/$PROGTYPE/${MODULE}\""
       fi
       g.message "You need to enter the root password next to install ${MODULE}:"
-      su -c "make MODULE_TOPDIR="$GISBASE" INST_DIR="$MYINST_DIR" install"
+      su -c "make MODULE_TOPDIR="$GISBASE" ARCH_DISTDIR="$TMPDIR/dist" INST_DIR="$MYINST_DIR" install"
    else
       if test -f "${MYINST_DIR}/$PROGTYPE/${MODULE}" ; then
          rm -f "${MYINST_DIR}/$PROGTYPE/${MODULE}"
       fi
-      make MODULE_TOPDIR="$GISBASE" INST_DIR="$MYINST_DIR" install
+      make MODULE_TOPDIR="$GISBASE" ARCH_DISTDIR="$TMPDIR/dist" INST_DIR="$MYINST_DIR" install
    fi
 
    if [ $? -ne 0 ] ; then