--- src/cmd/INIT/iffe.sh +++ src/cmd/INIT/iffe.sh 2007-04-03 12:04:01.646371815 +0200 @@ -1052,7 +1052,7 @@ case `(getopts '[-][123:xyz]' opt --xyz; --*) echo $command: $1: unknown option >&2 exit 2 ;; - -*) REM=`echo $1 | sed -e 's,-,,'` + -*) REM=`echo -$1 | sed -e 's,^--,,'` ;; *) break ;; --- src/cmd/INIT/Mamfile +++ src/cmd/INIT/Mamfile 2006-03-24 16:37:10.000000000 +0100 @@ -5,7 +5,7 @@ setv AR ar setv ARFLAGS cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -27,7 +27,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc --- src/cmd/ksh93/Mamfile +++ src/cmd/ksh93/Mamfile 2007-03-30 15:02:30.693912442 +0200 @@ -7,7 +7,7 @@ setv AR ar setv ARFLAGS cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc @@ -684,7 +684,7 @@ prev ${PACKAGE_ast_INCLUDE}/ast.h implic done sh/main.c meta main.o %.c>%.o sh/main.c main prev sh/main.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -c sh/main.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -c sh/main.c done main.o generated make nvdisc.o make sh/nvdisc.c @@ -1106,7 +1106,7 @@ prev ${PACKAGE_ast_INCLUDE}/ccode.h impl done sh/trestore.c meta trestore.o %.c>%.o sh/trestore.c trestore prev sh/trestore.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -DSHOPT_ESH -c sh/trestore.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -DSHOPT_ESH -c sh/trestore.c done trestore.o generated make waitevent.o make sh/waitevent.c @@ -1345,7 +1345,7 @@ prev +ljobs prev +li prev ${mam_libsocket} prev ${mam_libsecdb} -exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libdl} ${mam_libast} +exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libdl} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} done ksh generated make shcomp make shcomp.o @@ -1368,7 +1368,7 @@ prev ${mam_libsocket} prev ${mam_libsecdb} setv CC.DLL -UCC.DLL setv SH_DICT -DSH_DICT="\"libshell\"" -exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libdl} ${mam_libast} +exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libdl} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} done shcomp generated make suid_exec make suid_exec.o --- src/lib/libast/Mamfile +++ src/lib/libast/Mamfile 2007-03-28 17:45:49.748548000 +0200 @@ -5,7 +5,7 @@ setv AR ar setv ARFLAGS cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} -D_BLD_ast setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -27,7 +27,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc @@ -478,7 +478,7 @@ done misc/findlib.h done misc/fastfind.c meta fastfind.o %.c>%.o misc/fastfind.c fastfind prev misc/fastfind.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c done fastfind.o generated make hashalloc.o make hash/hashalloc.c @@ -913,7 +913,7 @@ make lcgen make port/lcgen.c prev std/stdio.h implicit done port/lcgen.c -exec - ${CC} -o lcgen port/lcgen.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o lcgen port/lcgen.c done lcgen generated make port/lc.tab done port/lc.tab @@ -1458,7 +1458,7 @@ done sfio/sfhdr.h done port/mc.c meta mc.o %.c>%.o port/mc.c mc prev port/mc.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c done mc.o generated make base64.o make string/base64.c @@ -2756,7 +2756,7 @@ prev include/ast.h implicit done comp/spawnveg.c meta spawnveg.o %.c>%.o comp/spawnveg.c spawnveg prev comp/spawnveg.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c done spawnveg.o generated make vfork.o make comp/vfork.c @@ -4074,7 +4074,7 @@ prev sfio/sfhdr.h implicit done sfio/sfrd.c meta sfrd.o %.c>%.o sfio/sfrd.c sfrd prev sfio/sfrd.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c done sfrd.o generated make sfread.o make sfio/sfread.c @@ -4229,7 +4229,7 @@ prev sfio/sfhdr.h implicit done sfio/sfvprintf.c meta sfvprintf.o %.c>%.o sfio/sfvprintf.c sfvprintf prev sfio/sfvprintf.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c done sfvprintf.o generated make sfvscanf.o make sfio/sfvscanf.c @@ -6849,58 +6849,31 @@ exec - test '' = 'misc/magic.tab' || ${S done ${INSTALLROOT}/lib/file/magic generated prev comp/fmtmsg.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } prev comp/libgen.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } prev comp/syslog.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } make ${INSTALLROOT}/include/ast/prototyped.h prev ${INSTALLROOT}/include/ast exec - echo "#include <../prototyped.h>" > 1.${COTEMP}.x --- src/lib/libcmd/Mamfile +++ src/lib/libcmd/Mamfile 2007-03-28 17:46:26.661392000 +0200 @@ -7,7 +7,7 @@ setv AR ar setv ARFLAGS cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc @@ -556,7 +556,7 @@ make id.o prev id.c meta id.o %.c>%.o id.c id prev id.c -exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2007 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c +exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2007 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c done id.o generated make join.o prev join.c --- src/lib/libdll/Mamfile +++ src/lib/libdll/Mamfile 2006-03-24 16:50:04.000000000 +0100 @@ -7,7 +7,7 @@ setv AR ar setv ARFLAGS cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc