Fix mech of building export on AIX

Presently, the distinction between 32Bit and 64Bit AIX is done by
inserting a "#" (comment-sign) into the Makefile.
This fails on some AIX-installations. Thus, just use normal
conditionals for distinguishing betwenn 32 and 64 bit.

Change-Id: Ie83bbdcd3c7c4b7b0858c9691bf6e1bf6c4ba32a
Reviewed-on: http://gerrit.openafs.org/3434
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 48fe793..a041334 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -481,8 +481,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64="#"
+               AIX32="yes"
+               AIX64="no"
                ;;
 
 
@@ -497,8 +497,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix52)       
@@ -512,8 +512,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix53)       
@@ -527,8 +527,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix61)       
@@ -542,8 +542,8 @@ case $AFS_SYSNAME in
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32="#"
-               AIX64=""
+               AIX32="no"
+               AIX64="yes"
                ;;
 
        s390_linux22)

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index a68f5ad..dfe2cee 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -112,6 +112,8 @@ YACC = @YACC@
 dest_XFS_SIZE_CHECK = @dest_XFS_SIZE_CHECK@
 install_XFS_SIZE_CHECK = @install_XFS_SIZE_CHECK@
 XFS_SIZE_CHECK = @XFS_SIZE_CHECK@
+AIX32 = @AIX32@
+AIX64 = @AIX64@
 
 #
 # Paths to build dirs

diff --git a/src/export/Makefile.in b/src/export/Makefile.in
index c06fd38..8aec877 100644 (file)
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@@ -18,26 +18,34 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
   IMPORTS = /lib/kernex.exp /lib/syscalls.exp ${srcdir}/extras.exp
      KOBJ = export.o symtab.o
 
-EXPORTS32 = @AIX32@export.exp export.ext.nonfs export.ext cfgexport cfgafs
-EXPORTS64 = @AIX64@export64.exp export64.ext.nonfs export64.ext cfgexport64 cfgafs64
-TOPEXP32  = @AIX32@${TOP_LIBDIR}/export.exp
-TOPEXP64  = @AIX64@${TOP_LIBDIR}/export64.exp
+EXPORTS32 = export.exp export.ext.nonfs export.ext cfgexport cfgafs
+TOPEXP32  = ${TOP_LIBDIR}/export.exp
+EXPORTS64 = export64.exp export64.ext.nonfs export64.ext cfgexport64 cfgafs64
+TOPEXP64  = ${TOP_LIBDIR}/export64.exp
 
 all: $(TOPEXP32) $(TOPEXP64) ${TOP_LIBDIR}/extras.exp
        ${INSTALL} -d ${KERNELDIR}
        ${INSTALL} -d ${UKERNELDIR}
        ${INSTALL_DATA} ${srcdir}/export.h ${KERNELDIR}/export.h
-       @AIX32@${INSTALL_DATA} export.exp ${KERNELDIR}/export.exp
-       @AIX64@${INSTALL_DATA} export64.exp ${KERNELDIR}/export64.exp
        ${INSTALL_DATA} ${srcdir}/export.h ${UKERNELDIR}/export.h
-       @AIX32@${INSTALL_DATA} export.exp ${UKERNELDIR}/export.exp
-       @AIX64@${INSTALL_DATA} export64.exp ${UKERNELDIR}/export64.exp
+       if [ "x$(AIX32)" = "xyes" ]; then  \
+         ${INSTALL_DATA} export.exp ${UKERNELDIR}/export.exp; \
+         ${INSTALL_DATA} export.exp ${KERNELDIR}/export.exp; \
+       fi
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         ${INSTALL_DATA} export64.exp ${KERNELDIR}/export64.exp; \
+         ${INSTALL_DATA} export64.exp ${UKERNELDIR}/export64.exp; \
+       fi
 
 ${TOP_LIBDIR}/export.exp: export.exp
-       ${INSTALL_DATA} $? $@
+       if [ "x$(AIX32)" = "xyes" ]; then  \
+         ${INSTALL_DATA} $? $@ ; \
+       fi
 
 ${TOP_LIBDIR}/export64.exp: export64.exp
-       ${INSTALL_DATA} $? $@
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         ${INSTALL_DATA} $? $@ ; \
+       fi
 
 ${TOP_LIBDIR}/extras.exp: ${srcdir}/extras.exp
        ${INSTALL_DATA} $? $@
@@ -63,19 +71,27 @@ export64.exp: ${srcdir}/export4-64.exp ${srcdir}/export5-64.exp
        esac
 
 export.ext: ${KOBJ}
-       ${LD} -o export.ext -eexport ${IMPORTS} ${KOBJ} ${EXPORTS} -lcsys
+       if [ "x$(AIX32)" = "xyes" ]; then  \
+         ${LD} -o export.ext -eexport ${IMPORTS} ${KOBJ} ${EXPORTS} -lcsys ; \
+       fi
 
 export64.ext: export64.o symtab64.o
-       ${LD} -b64 -o export64.ext -eexport ${IMPORTS} export64.o symtab64.o \
-               -bexport:export64.exp -lcsys
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         ${LD} -b64 -o export64.ext -eexport ${IMPORTS} export64.o symtab64.o \
+               -bexport:export64.exp -lcsys ; \
+       fi
 
 export.ext.nonfs: export.nonfs.o symtab.o
-       ${LD} -o export.ext.nonfs -eexport ${IMPORTS} export.nonfs.o \
-               symtab.o ${EXPORTS} -lcsys
+       if [ "x$(AIX32)" = "xyes" ]; then  \
+         ${LD} -o export.ext.nonfs -eexport ${IMPORTS} export.nonfs.o \
+               symtab.o ${EXPORTS} -lcsys ; \
+       fi
 
 export64.ext.nonfs: export64.nonfs.o symtab64.o
-       ${LD} -b64 -o export64.ext.nonfs -eexport ${IMPORTS} export64.nonfs.o \
-               symtab64.o -bexport:export64.exp -lcsys
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         ${LD} -b64 -o export64.ext.nonfs -eexport ${IMPORTS} export64.nonfs.o \
+               symtab64.o -bexport:export64.exp -lcsys ; \
+       fi
 
 symtab.o symtab64.o: ${srcdir}/symtab.c
        case ${SYS_NAME} in \
@@ -138,24 +154,32 @@ cfgexport: cfgexport.o
        $(CC) $(LDFLAGS) -g ${INCS} -o cfgexport cfgexport.o
 
 cfgexport64: cfgexport64.o
-       $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgexport64 cfgexport64.o
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgexport64 cfgexport64.o ; \
+       fi
 
 cfgafs: cfgafs.o
        $(CC) $(LDFLAGS) ${INCS} -o cfgafs cfgafs.o
 
 cfgafs64: cfgafs64.o
-       $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgafs64 cfgafs64.o
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgafs64 cfgafs64.o ; \
+       fi
 
 CFLAGS_cfgexport64.o = -g -q64 -D__XCOFF64__ 
 cfgexport64.o: ${srcdir}/cfgexport.c AFS_component_version_number.c
-       $(AFS_CCRULE) $(srcdir)/cfgexport.c
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         $(AFS_CCRULE) $(srcdir)/cfgexport.c ; \
+       fi
 
 cfgexport.o: ${srcdir}/cfgexport.c AFS_component_version_number.c
 cfgafs.o: ${srcdir}/cfgafs.c AFS_component_version_number.c
 
 CFLAGS_cfgafs64.o = -q64
 cfgafs64.o: ${srcdir}/cfgafs.c AFS_component_version_number.c
-       $(AFS_CCRULE) $(srcdir)/cfgafs.c
+       if [ "x$(AIX64)" = "xyes" ]; then  \
+         $(AFS_CCRULE) $(srcdir)/cfgafs.c ; \
+       fi
 
 clean:
        $(RM) -f *.o *.Zlst *.map *.out AFS_component_version_number.c
@@ -168,30 +192,38 @@ install: $(EXPORTS32) $(EXPORTS64)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
        ${INSTALL_DATA} ${srcdir}/extras.exp ${DESTDIR}${libdir}/afs/extras.exp
-       @AIX32@${INSTALL_DATA} export.exp ${DESTDIR}${libdir}/afs/export.exp
-       @AIX32@${INSTALL_DATA} export.ext ${DESTDIR}${afskerneldir}/export.ext
-       @AIX32@${INSTALL_DATA} export.ext.nonfs ${DESTDIR}${afskerneldir}/export.ext.nonfs
-       @AIX32@${INSTALL_DATA} cfgexport ${DESTDIR}${afskerneldir}/cfgexport
-       @AIX32@${INSTALL_DATA} cfgafs ${DESTDIR}${afskerneldir}/cfgafs
-       @AIX64@${INSTALL_DATA} export64.exp ${DESTDIR}${libdir}/afs/export64.exp
-       @AIX64@${INSTALL_DATA} export64.ext ${DESTDIR}${afskerneldir}/export64.ext
-       @AIX64@${INSTALL_DATA} export64.ext.nonfs ${DESTDIR}${afskerneldir}/export64.ext.nonfs
-       @AIX64@${INSTALL_DATA} cfgexport64 ${DESTDIR}${afskerneldir}/cfgexport64
-       @AIX64@${INSTALL_DATA} cfgafs64 ${DESTDIR}${afskerneldir}/cfgafs64
+       if [ "xyes" = "x$(AIX32)" ]; then \
+         ${INSTALL_DATA} export.exp ${DESTDIR}${libdir}/afs/export.exp ; \
+         ${INSTALL_DATA} export.ext ${DESTDIR}${afskerneldir}/export.ext ; \
+         ${INSTALL_DATA} export.ext.nonfs ${DESTDIR}${afskerneldir}/export.ext.nonfs ; \
+         ${INSTALL_DATA} cfgexport ${DESTDIR}${afskerneldir}/cfgexport ; \
+         ${INSTALL_DATA} cfgafs ${DESTDIR}${afskerneldir}/cfgafs ; \
+       fi
+       if [ "xyes" = "x$(AIX64)" ]; then \
+         ${INSTALL_DATA} export64.exp ${DESTDIR}${libdir}/afs/export64.exp ; \
+         ${INSTALL_DATA} export64.ext ${DESTDIR}${afskerneldir}/export64.ext ; \
+         ${INSTALL_DATA} export64.ext.nonfs ${DESTDIR}${afskerneldir}/export64.ext.nonfs ; \
+         ${INSTALL_DATA} cfgexport64 ${DESTDIR}${afskerneldir}/cfgexport64 ; \
+         ${INSTALL_DATA} cfgafs64 ${DESTDIR}${afskerneldir}/cfgafs64 ; \
+       fi
 
 dest: $(EXPORTS32) $(EXPORTS64)
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload
        ${INSTALL} -d ${DEST}/lib/afs
        ${INSTALL_DATA} ${srcdir}/extras.exp ${DEST}/lib/afs/extras.exp
-       @AIX32@${INSTALL_DATA} export.exp ${DEST}/lib/afs/export.exp
-       @AIX32@${INSTALL} export.ext ${DEST}/root.client/usr/vice/etc/dkload/export.ext
-       @AIX32@${INSTALL} export.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs
-       @AIX32@${INSTALL} cfgexport ${DEST}/root.client/usr/vice/etc/dkload/cfgexport
-       @AIX32@${INSTALL} cfgafs ${DEST}/root.client/usr/vice/etc/dkload/cfgafs
-       @AIX64@${INSTALL_DATA} export64.exp ${DEST}/lib/afs/export64.exp
-       @AIX64@${INSTALL} export64.ext ${DEST}/root.client/usr/vice/etc/dkload/export64.ext
-       @AIX64@${INSTALL} export64.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs
-       @AIX64@${INSTALL} cfgexport64 ${DEST}/root.client/usr/vice/etc/dkload/cfgexport64
-       @AIX64@${INSTALL} cfgafs64 ${DEST}/root.client/usr/vice/etc/dkload/cfgafs64
+       if [ "xyes" = "x$(AIX32)" ];then \
+         ${INSTALL_DATA} export.exp ${DEST}/lib/afs/export.exp ; \
+         ${INSTALL} export.ext ${DEST}/root.client/usr/vice/etc/dkload/export.ext ; \
+         ${INSTALL} export.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs ; \
+         ${INSTALL} cfgexport ${DEST}/root.client/usr/vice/etc/dkload/cfgexport ; \
+         ${INSTALL} cfgafs ${DEST}/root.client/usr/vice/etc/dkload/cfgafs ; \
+       fi
+       if [ "xyes" = "x$(AIX64)" ];then \
+         ${INSTALL_DATA} export64.exp ${DEST}/lib/afs/export64.exp ; \
+         ${INSTALL} export64.ext ${DEST}/root.client/usr/vice/etc/dkload/export64.ext ; \
+         ${INSTALL} export64.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs ; \
+         ${INSTALL} cfgexport64 ${DEST}/root.client/usr/vice/etc/dkload/cfgexport64 ; \
+         ${INSTALL} cfgafs64 ${DEST}/root.client/usr/vice/etc/dkload/cfgafs64 ; \
+       fi
 
 include ../config/Makefile.version