allow-shadowed-src-trees-20010305

[openafs.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index cb66684..726cf48 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ INSTALL=${SRCDIR}bin/install
 WASHTOOL=${SRCDIR}bin/washtool
 
 #WASHTOOLRCSUPDATE=${WASHTOOL} rcsupdate
-WASHTOOLCMD=make
+WASHTOOLCMD=$(MAKE)
 WASHTOOLFLAGS=-argument install
 
 COMPILE_PART1=${WASHTOOL} ${WASHTOOLCMD}
@@ -69,7 +69,7 @@ comerr: basics util
 cmd: basics comerr
        ${COMPILE_PART1} cmd ${COMPILE_PART2}
        @case ${SYS_NAME} in \
-       sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* ) \
+       sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* ) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2} install64 ;; \
        esac
 
@@ -255,12 +255,6 @@ vfsck:     minproject vol
                echo skip vfsck for ${SYS_NAME} ;; \
        rs_aix42)       \
                echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_55 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_56 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_57 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
        sun4x_58 )  \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
@@ -450,7 +444,7 @@ libafs_setup: config minproject export
 # Warning: The next few lines are _extremely_ sensitive to spaces and tabs.
        ${WASHTOOL} object libafs
        case ${SYS_NAME} in \
-       alpha_dux4* ) \
+       alpha_dux* ) \
                MKAFS_OSTYPE=DUX;; \
        hp_ux* ) \
                MKAFS_OSTYPE=HPUX;; \
@@ -481,7 +475,7 @@ libuafs_setup: config minproject export
                MKAFS_OSTYPE=AIX;; \
        sun4x_5* ) \
                MKAFS_OSTYPE=SOLARIS;; \
-       alpha_dux4* ) \
+       alpha_dux* ) \
                MKAFS_OSTYPE=DUX;; \
        sgi_6* ) \
                MKAFS_OSTYPE=IRIX;; \
@@ -528,12 +522,14 @@ links:
        - /bin/rm -rf @sys/dest/* ;
        - /bin/mkdir @sys/obj ;
        echo "Create the obj directories"
+       here=`pwd` ; \
        cd src; \
        for file in `find [!NW]* -type d -print` ; do \
-               /bin/mkdir ../obj/$${file} ; \
+               /bin/mkdir $${here}/obj/$${file} ; \
        done;
        echo "Create the obj file links"
+       here=`pwd` ; \
        cd src; \
        for file in `find [!NW]* -type f -print` ; do \
-               /bin/ln -s `pwd`/$${file} ../obj/$${file} ; \
+               /bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
        done;