--- ./source/doc/Makefile Fri Apr 5 12:53:49 2002 +++ ../Sharity.2.7/./source/doc/Makefile Sat Jun 8 16:26:18 2002 @@ -7,15 +7,15 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.3 2002/04/05 17:53:49 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -all: $(ROOT)../install/manual +all: $(SRCROOT)../install/manual manual: (cd manual-src; ./make.sh) -$(ROOT)../install/manual: manual - tar cf - manual | (cd "$(ROOT)../install/"; tar xf -) +$(SRCROOT)../install/manual: manual + tar cf - manual | (cd "$(SRCROOT)../install/"; tar xf -) clean: - rm -rf "$(ROOT)../install/manual" + rm -rf "$(SRCROOT)../install/manual" --- ./source/mainFramework/mainconst.h Fri May 31 08:08:06 2002 +++ ../Sharity.2.7/./source/mainFramework/mainconst.h Sat Jun 8 16:27:29 2002 @@ -29,9 +29,9 @@ #define CONST_TEMPSOCKET_PATH "/tmp/.sharity.tmp.%d.%d.%d" /* temporary socket template */ -#define CONST_CONFIG_PATH "/usr/local/sharity/etc/sharity.cfg" -#define CONST_DBFILE_PATH "/usr/local/sharity/var/cfgdb.ppl" -#define CONST_HELPFILE_PATH "/usr/local/sharity/etc/help.html" +#define CONST_CONFIG_PATH "/usr/freeware/etc/sharity.cfg" +#define CONST_DBFILE_PATH "/usr/freeware/var/sharity/cfgdb.ppl" +#define CONST_HELPFILE_PATH "/usr/freeware/lib/sharity/help.html" #define CONST_UNI_TABLE_COMPRESS 3 /* number of blocks for sparse array */ #define CONST_IPC_WINDOWSIZE 4 /* window size for commandline utility IPC */ --- ./source/mainFramework/setup Mon Apr 2 09:07:21 2001 +++ ../Sharity.2.7/./source/mainFramework/setup Sat Jun 8 16:38:31 2002 @@ -15,6 +15,7 @@ PATH=$PATH:/etc:/usr/ucb:/sbin:/usr/sbin # extend search path +INSTALL=${INSTALL:-install} # idb packager for -sgi uninstlist=/tmp/setup-uilist-`whoami`-$$ tmpfile=/tmp/setup-tmp-`whoami`-$$ @@ -22,9 +23,14 @@ packageName=unknown quietOption=n +# srosa/SGI +# added -sgi to handle freeware idb generation +# added -local to create localized files without installing (requires -sgi) while [ $# -gt 0 ]; do case $1 in -q) quietOption=y ;; + -sgi) if [ ! -d ./tmp ]; then mkdir ./tmp; fi; tmpfile="./tmp/"; sgiFreeware=y ;; + -local) localizeOnly=y ;; *) echo "Option $1 not known." ; exit 1 ;; esac shift @@ -45,6 +51,9 @@ setup_removeaction() { + if [ "$sgiFreeware" = y -a "$localizeOnly" = y ]; then + return + fi touch "$uninstlist" # this file must exist rmactiontmp="$uninstlist.tmp" echo "$1" | cat - "$uninstlist" >"$rmactiontmp" @@ -54,10 +63,16 @@ setup_directory() { + if [ "$sgiFreeware" = y -a "$localizeOnly" = y ]; then + return + fi destination="$1" owner="$2" mode="$3" - if [ '!' -d "$destination" ]; then + if [ "$sgiFreeware" = y ]; then + echo "idb directory: $destination" + $INSTALL -u "$owner" -m "$mode" -d "$destination" + elif [ '!' -d "$destination" ]; then echo "Creating directory: $destination" mkdir "$destination" if [ $? != 0 ]; then @@ -124,6 +139,17 @@ if [ -z "$from" ]; then echo "*** File \"$source\" missing in package, skipped." else + if [ "$sgiFreeware" = y ]; then + if [ "$doLocalize" = yes ]; then + rm -f ${tmpfile}`basename $from` + substitute "$from" "${tmpfile}`basename $from`" + from="${tmpfile}`basename $from`" + fi + if [ ! "$localizeOnly" = y ]; then + echo "idb file: $source -> $destination" + $INSTALL -u "$owner" -m "$mode" "$from" "$destination" + fi + else if [ "$doLocalize" = yes ]; then rm -f $tmpfile substitute "$from" "$tmpfile" @@ -138,6 +164,7 @@ fi chmod "$mode" "$destination" setup_removeaction "rm -f '$destination'" + fi fi } @@ -144,6 +171,9 @@ # parameters: source-tree, destination-path, owner, mode setup_tree() { + if [ "$sgiFreeware" = y -a "$localizeOnly" = y ]; then + return + fi source="$1" destination="$2" owner="$3" @@ -152,6 +182,12 @@ if [ -z "$from" ]; then echo "*** Tree $source not in package, skipped." else + if [ "$sgiFreeware" = y ]; then + echo "idb tree: $from -> $destination" + # can't use $mode because it is not in numeric form in filelist + find "${from}/" -type d -exec $INSTALL -m 755 -u $owner -d $destination \; + find "${from}/" -type f -exec $INSTALL -m 644 -u $owner {} $destination \; + else rm -rf "$destination" echo "Installing tree: $destination" cp -rp "$from" "$destination" @@ -160,6 +196,7 @@ chown -R "$owner" "$destination" fi setup_removeaction "rm -rf '$destination'" + fi fi } @@ -166,12 +203,20 @@ # parameters: source-path destination-path setup_link() { + if [ "$sgiFreeware" = y -a "$localizeOnly" = y ]; then + return + fi source="$1" destination="$2" - echo "Installing link: $destination" - rm -f "$destination" - ln -s "$source" "$destination" - setup_removeaction "rm -f '$destination'" + if [ "$sgiFreeware" = y ]; then + echo "idb (fake) link: $source -> $destination" + $INSTALL -u root "$source" "SYMLINKto$destination" + else + echo "Installing link: $destination" + rm -f "$destination" + ln -s "$source" "$destination" + setup_removeaction "rm -f '$destination'" + fi } # parameters: variable-name, default-value 2< help-Text @@ -202,8 +247,10 @@ setup_uninstallscript() { + if [ "$sgiFreeware" != y ]; then globalUninstallScript="$1" setup_removeaction "rm -f '$globalUninstallScript'" + fi } setup_setname() @@ -216,7 +263,7 @@ ############################################################################### notroot=no -if [ `whoami` != root ]; then +if [ `whoami` != root -a "$quietOption" != y ]; then echo echo "$0 should be run as root. If you run it as user, $0 probably" echo "can't access all installation pathes and can't set ownerships." @@ -280,5 +327,7 @@ chmod a+x "$globalUninstallScript" fi rm -f "$uninstlist" - rm -f "$tmpfile" + if [ "$sgiFreeware" != y ]; then + rm -f "$tmpfile" + fi } # you may add redirections here --- ./source/mainFramework/Makefile Tue Nov 6 04:50:36 2001 +++ ../Sharity.2.7/./source/mainFramework/Makefile Sat Jun 8 16:38:52 2002 @@ -7,22 +7,22 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.8 2001/11/06 09:50:36 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I$(SRCROOT)foundation OBJ = blockalloc.o diskarb.o guimanager.o ipcserver.o module.o\ mainmodule.o main.o -ARCHIVES = $(ROOT)libs/nfs2.a $(ROOT)libs/nfs3.a $(ROOT)libs/dummyfs.a $(ROOT)libs/cifs.a\ - $(ROOT)libs/foundation.a +ARCHIVES = $(SRCROOT)libs/nfs2.a $(SRCROOT)libs/nfs3.a $(SRCROOT)libs/dummyfs.a $(SRCROOT)libs/cifs.a\ + $(SRCROOT)libs/foundation.a -PROGRAM = $(ROOT)../install/sharityd +PROGRAM = $(SRCROOT)../install/sharityd SUPPORTFILES = help.html sharity.cfg test.cfg cfgdb.ppl sharity.init\ StartupParameters.plist filelist setup -all: $(PROGRAM) $(ROOT)../install/unitables +all: $(PROGRAM) $(SRCROOT)../install/unitables .c.o: $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SSLFLAGS) -c $*.c -o $*.o @@ -29,12 +29,12 @@ clean: rm -f *.o $(PROGRAM) - for i in $(SUPPORTFILES); do rm -f "$(ROOT)../install/$$i"; done - rm -rf "$(ROOT)../install/unitables" + for i in $(SUPPORTFILES); do rm -f "$(SRCROOT)../install/$$i"; done + rm -rf "$(SRCROOT)../install/unitables" $(PROGRAM): $(OBJ) $(ARCHIVES) $(CC) $(CFLAGS) -o $@ $(OBJ) $(ARCHIVES) $(LIBS) $(SSLLIBS) - for i in $(SUPPORTFILES); do cp "$$i" "$(ROOT)../install/$$i"; done + for i in $(SUPPORTFILES); do cp "$$i" "$(SRCROOT)../install/$$i"; done -$(ROOT)../install/unitables: unitables - cp -rp unitables "$(ROOT)../install/" +$(SRCROOT)../install/unitables: unitables + cp -rp unitables "$(SRCROOT)../install/" --- ./source/mainFramework/filelist Mon Jun 3 18:13:08 2002 +++ ../Sharity.2.7/./source/mainFramework/filelist Sat Jun 8 16:44:14 2002 @@ -92,7 +92,7 @@ if [ "$variant" = 1 ]; then -$defvar "globaldir" "/usr/local/sharity" 2<< EOF +$defvar "globaldir" "/usr/freeware" 2<< EOF Where do you want to install Sharity? Since you decided for the stand-alone installation, this directory must be on the local disk, not on any server. Please enter the directory path without trailing slash. @@ -102,7 +102,7 @@ else -$defvar "globaldir" "/usr/local/sharity" 2<< EOF +$defvar "globaldir" "/usr/freeware/sharity" 2<< EOF You have selected a server-based installation. We therefore need to know where on the server Sharity should be installed. If you are installing on the server, this is the local path where the bulk of the installed files @@ -112,7 +112,7 @@ without trailing slash. EOF -$defvar "privatedir" "/usr/local/sharity" 2<< EOF +$defvar "privatedir" "/usr/freeware" 2<< EOF Now we need to know where to install files which must be local to the machine. The directory you enter *must* be on the local disk. Please enter the directory path without trailing slash. @@ -137,7 +137,7 @@ exit 1 fi -$defvar "bindir" "/usr/local/bin" 2<< \EOF +$defvar "bindir" "/usr/freeware/bin" 2<< \EOF The sharity commandline utilities should be in your search path for easy access. This can be accomplished in two ways: Either you edit your PATH environment variable accordingly (you have to do this by hand, the setup @@ -266,7 +266,6 @@ #---------------------------------------------------- # directory owner unix-mode #------------------------------------------------- -$directory "$privatedir" root 0755 $directory "$privatedir/var" root 0755 $directory "$privatedir/var/mount" root 0755 $directory "$browsedir" root 0755 @@ -293,6 +292,8 @@ $directory "$globaldir/bin" root 0755 $directory "$globaldir/sbin" root 0755 $directory "$globaldir/etc" root 0755 + $directory "$globaldir/lib" root 0755 + $directory "$globaldir/lib/sharity" root 0755 #----------------------------------------------------------------------------- # file name destination path owner mode localize @@ -301,7 +302,7 @@ $file sharity.init "$globaldir/sbin/sharity.init" root 0755 yes $file sharity "$globaldir/bin/sharity" root 0755 no $file sharity.cfg "$globaldir/etc/sharity.cfg" root 0644 yes - $file help.html "$globaldir/etc/help.html" root 0644 yes + $file help.html "$globaldir/lib/sharity/help.html" root 0644 yes $tree unitables "$globaldir/etc/unitables" root a+rX,go-w if [ "$isOpenstep" != yes ]; then # NeXT and MacOS-X don't have X11, therefore no X-Windows GUI. The GUI is @@ -310,12 +311,13 @@ fi # don't install the manual with $tree because it needs to be localized if [ -d manual ]; then - $directory "$globaldir/manual" root 0755 + $directory "$globaldir/doc" root 0755 + $directory "$globaldir/doc/sharity" root 0755 for manfile in manual/*; do if [ `expr "$manfile" ':' '.*[.]html$'` != 0 ]; then - $file "$manfile" "$globaldir/$manfile" root 0644 yes + $file "$manfile" "$globaldir/doc/sharity/`basename $manfile`" root 0644 yes else - $file "$manfile" "$globaldir/$manfile" root 0644 no + $file "$manfile" "$globaldir/doc/sharity/`basename $manfile`" root 0644 no fi done else @@ -341,11 +343,12 @@ #---------------------------------------------------- $directory "$configdir" root 0755 $directory "$configdir/var" root 0755 + $directory "$configdir/var/sharity" root 0755 #----------------------------------------------------------------------------- # file name destination path owner mode localize #----------------------------------------------------------------------------- - $file cfgdb.ppl "$configdir/var/cfgdb.ppl" root 0644 yes + $file cfgdb.ppl "$configdir/var/sharity/cfgdb.ppl" root 0644 yes fi if [ -n "$bindir" ]; then @@ -403,8 +406,8 @@ after clicking "Help". Most of the settings will not be editable. If you hold the mouse cursor over a setting's description, the status bar will tell you why a setting is not editable. Please don't switch to "Expert Mode" unless you -are sure you have to change an expert setting! If you ever want to uninstall -Sharity, use the script $privatedir/uninstall. +are sure you have to change an expert setting! + The manual can be found at $globaldir/manual/index.html EOF --- ./source/mainFramework/sharity.cfg Mon Jun 3 17:58:18 2002 +++ ../Sharity.2.7/./source/mainFramework/sharity.cfg Sat Jun 8 16:45:19 2002 @@ -73,11 +73,11 @@ # The variable "configDbFile" defines the path to the file which stores # GUI options persistently. - configDbFile = "%configdir%/var/cfgdb.ppl" + configDbFile = "%configdir%/var/sharity/cfgdb.ppl" # Sharity reads almost all help texts for the GUI from an external file. # The variable 'helpFile' allows setting the path to this file. - helpFile = "%globaldir%/etc/help.html"; + helpFile = "%globaldir%/lib/sharity/help.html"; # If the automatic detection of network interfaces does not work for you, you # can specify them manually in the following setting. The syntax is an array @@ -709,10 +709,10 @@ sslRequireEncryption = no; // if "yes", only SSL connections will be allowed sslVersion = ssl2or3; // may be ssl2, ssl3, ssl2or3, tls1 sslCompatibility = no; -// sslCACertDir = "/usr/local/ssl/certs"; -// sslCACertFile = "/usr/local/ssl/certs/CAobdev.pem"; -// sslKeyFile = "/usr/local/ssl/private/sharity.pem" -// sslCertFile = "/usr/local/ssl/certs/sharity.pem" +// sslCACertDir = "/usr/freeware/lib/openssl/certs"; +// sslCACertFile = "/usr/freeware/lib/openssl/certs/CAobdev.pem"; +// sslKeyFile = "/usr/freeware/lib/openssl/private/sharity.pem" +// sslCertFile = "/usr/freeware/lib/openssl/certs/sharity.pem" sslRequireServerCert = yes; // sslCiphers = ""; --- ./source/Makefile.config Mon Jun 3 09:43:42 2002 +++ ../Sharity.2.7/./source/Makefile.config Sat Jun 8 16:48:05 2002 @@ -12,7 +12,7 @@ ############################################################################## # You may want to change gcc to cc in the following line: -CC= gcc +#CC= gcc # Configure the type of GUI you want to have here. You specify the name # of the directory containing the GUI code for your platform. Leave it @@ -25,8 +25,8 @@ # of the dynamic libraries installed (known as DLL-hell in the Windows world). # If you create a binary package for distribution, please use static linking # in any case! -GTK_LINK_TYPE=--static-libs # use this for static linking of GTK -#GTK_LINK_TYPE=--libs # use this for dynamic linking of GTK +#GTK_LINK_TYPE=--static-libs # use this for static linking of GTK +GTK_LINK_TYPE=--libs # use this for dynamic linking of GTK # for Linux, AIX, SGI/IRIX, NEXTSTEP, OPENSTEP/Mach, DEC/OSF1, BSDI2.x, NetBSD, @@ -40,8 +40,8 @@ #CFLAGS= -O2 -Wall -g -mabi=n32 -mips3 -fno-builtins # for Apple MacOS X [Public Beta] or Darwin use: -CFLAGS= -Wall -g -O2 -DHAVE_DISKARB -LIBS= -F/System/Library/PrivateFrameworks -framework DiskArbitration +#CFLAGS= -Wall -g -O2 -DHAVE_DISKARB +#LIBS= -F/System/Library/PrivateFrameworks -framework DiskArbitration # for BSDI3.x with gcc use: # CFLAGS= -Wall -g -O2 -DBSDI3 @@ -95,9 +95,9 @@ ######## Uncomment and edit the following if you compile with SSLeay ######### ############################################################################## -SSLROOT= /usr/local/ssl -# SSLLIBS= -L$(SSLROOT)/lib -lssl -lcrypto -# SSLFLAGS= -I$(SSLROOT)/include -DUSE_SSL +SSLROOT= $(ROOT)/usr/freeware/ +SSLLIBS= -L$(SSLROOT)/lib/openssl/lib32 -lssl -lcrypto +SSLFLAGS= -I$(SSLROOT)/include/openssl -DUSE_SSL ############################################### @@ -170,4 +170,4 @@ ############################################################################## -RANLIB = ranlib +RANLIB = : --- ./source/frontends/nfs2/Makefile Tue Apr 13 11:48:16 1999 +++ ../Sharity.2.7/./source/frontends/nfs2/Makefile Sat Jun 8 16:49:05 2002 @@ -7,14 +7,14 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.2 1999/04/13 15:48:16 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)mainFramework -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I$(SRCROOT)mainFramework -I$(SRCROOT)foundation OBJ = nfs2.o sunrpc.o childtable.o nfsfileadapter.o nfslutable.o\ nfslupseudo.o nfslookup.o -PROGRAM = $(ROOT)libs/nfs2.a +PROGRAM = $(SRCROOT)libs/nfs2.a all: $(PROGRAM) --- ./source/frontends/nfs2/nfs2.c Fri Apr 5 12:53:49 2002 +++ ../Sharity.2.7/./source/frontends/nfs2/nfs2.c Sat Jun 8 18:23:10 2002 @@ -901,7 +901,9 @@ /* ignore ENOENT because this means that nothing is mounted */ if(umountRval < 0 && storederr != ENOENT){ if(LOG_MODE_IS_ACTIVE(LOGM_ERROR)) - logPrintf(LOGM_ERROR, "nfs: sysUmount(): [%d] %s\n", storederr, sysStrerror(storederr)); + logPrintf(LOGM_ERROR, "nfs: sysUmount(%s): [%d] %s\n", + mp->mountpoint ? mp->mountpoint : "NULL", + storederr, sysStrerror(storederr)); _exit(storederr); } _exit(0); --- ./source/frontends/nfs3/Makefile Tue Nov 6 04:50:35 2001 +++ ../Sharity.2.7/./source/frontends/nfs3/Makefile Sat Jun 8 16:53:28 2002 @@ -7,13 +7,13 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.1 2001/11/06 09:50:35 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I../nfs2 -I$(ROOT)mainFramework -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I../nfs2 -I$(SRCROOT)mainFramework -I$(SRCROOT)foundation OBJ = nfs3.o nfs3fileadapter.o nfs3print.o nfs3xdr.o -PROGRAM = $(ROOT)libs/nfs3.a +PROGRAM = $(SRCROOT)libs/nfs3.a all: $(PROGRAM) --- ./source/frontends/nfs3/nfs3.c Tue Apr 16 13:06:15 2002 +++ ../Sharity.2.7/./source/frontends/nfs3/nfs3.c Sat Jun 8 18:23:28 2002 @@ -722,7 +722,9 @@ /* ignore ENOENT because this means that nothing is mounted */ if(umountRval < 0 && storederr != ENOENT){ if(LOG_MODE_IS_ACTIVE(LOGM_ERROR)) - logPrintf(LOGM_ERROR, "nfs3: sysUmount(): [%d] %s\n", storederr, sysStrerror(storederr)); + logPrintf(LOGM_ERROR, "nfs3: sysUmount(%s): [%d] %s\n", + mp->mountpoint ? mp->mountpoint : "NULL", + storederr, sysStrerror(storederr)); _exit(storederr); } _exit(0); --- ./source/frontends/Makefile Tue Nov 6 04:50:35 2001 +++ ../Sharity.2.7/./source/frontends/Makefile Sat Jun 8 16:48:32 2002 @@ -13,7 +13,7 @@ SUBDIRS = nfs2 nfs3 all: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done clean: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done --- ./source/uiCmdline/Makefile Tue Apr 13 11:48:22 1999 +++ ../Sharity.2.7/./source/uiCmdline/Makefile Sat Jun 8 16:49:28 2002 @@ -7,19 +7,19 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.3 1999/04/13 15:48:22 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)foundation -I$(ROOT)uiLib +INCLUDEFLAGS = -I. -I$(SRCROOT)foundation -I$(SRCROOT)uiLib OBJ = sharity.o -ARCHIVES = $(ROOT)libs/uiLib.a $(ROOT)libs/foundation.a +ARCHIVES = $(SRCROOT)libs/uiLib.a $(SRCROOT)libs/foundation.a -PROGRAM = $(ROOT)../install/sharity +PROGRAM = $(SRCROOT)../install/sharity -SYMLINKS = $(ROOT)../install/cifslicense $(ROOT)../install/cifslist\ - $(ROOT)../install/cifslogin $(ROOT)../install/cifslogout\ - $(ROOT)../install/cifsmount $(ROOT)../install/cifsstore\ - $(ROOT)../install/cifsstoremnt $(ROOT)../install/cifsumount +SYMLINKS = $(SRCROOT)../install/cifslicense $(SRCROOT)../install/cifslist\ + $(SRCROOT)../install/cifslogin $(SRCROOT)../install/cifslogout\ + $(SRCROOT)../install/cifsmount $(SRCROOT)../install/cifsstore\ + $(SRCROOT)../install/cifsstoremnt $(SRCROOT)../install/cifsumount all: $(PROGRAM) --- ./source/Makefile Thu Apr 26 10:13:44 2001 +++ ../Sharity.2.7/./source/Makefile Sat Jun 8 21:58:08 2002 @@ -10,12 +10,15 @@ # This is a generic Makefile which simply executes "make" in all # subdirectories. -include $(ROOT)Makefile.config +include ./Makefile.config SUBDIRS = foundation frontends backends uiLib mainFramework uiCmdline doc $(GUI_TYPE) all: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done clean: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done + +install: + (cd ../install && ./setup -q -sgi) || exit 1 --- ./source/uiGTK/Makefile Sun Aug 1 08:57:27 1999 +++ ../Sharity.2.7/./source/uiGTK/Makefile Sat Jun 8 16:50:36 2002 @@ -7,15 +7,15 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.8 1999/08/01 12:57:27 cs Exp $ -include $(ROOT)/Makefile.config +include $(SRCROOT)/Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)foundation -I$(ROOT)uiLib +INCLUDEFLAGS = -I. -I$(SRCROOT)foundation -I$(SRCROOT)uiLib OBJ = guiHelper.o guiLogging.o htmlDisplay.o guiMain.o -ARCHIVES = $(ROOT)libs/uiLib.a $(ROOT)libs/foundation.a +ARCHIVES = $(SRCROOT)libs/uiLib.a $(SRCROOT)libs/foundation.a -PROGRAM = $(ROOT)../install/Sharity +PROGRAM = $(SRCROOT)../install/Sharity all: $(PROGRAM) --- ./source/uiLib/Makefile Tue Apr 13 11:48:24 1999 +++ ../Sharity.2.7/./source/uiLib/Makefile Sat Jun 8 16:50:48 2002 @@ -7,13 +7,13 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.2 1999/04/13 15:48:24 cs Exp $ -include $(ROOT)/Makefile.config +include $(SRCROOT)/Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I$(SRCROOT)foundation OBJ = ipcclient.o -PROGRAM = $(ROOT)libs/uiLib.a +PROGRAM = $(SRCROOT)libs/uiLib.a all: $(PROGRAM) --- ./source/foundation/Makefile Mon Mar 25 09:32:21 2002 +++ ../Sharity.2.7/./source/foundation/Makefile Sat Jun 8 16:51:05 2002 @@ -7,7 +7,7 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.8 2002/03/25 14:32:21 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config INCLUDEFLAGS = -I. @@ -16,7 +16,7 @@ memalloc.o notification.o process.o scanner.o system.o unicode.o\ uniparse.o util.o wildmat.o -PROGRAM = $(ROOT)libs/foundation.a +PROGRAM = $(SRCROOT)libs/foundation.a all: $(PROGRAM) --- ./source/backends/cifs/Makefile Thu Apr 26 10:14:07 2001 +++ ../Sharity.2.7/./source/backends/cifs/Makefile Sat Jun 8 16:51:21 2002 @@ -7,9 +7,9 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.6 2001/04/26 14:14:07 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)mainFramework -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I$(SRCROOT)mainFramework -I$(SRCROOT)foundation OBJ = cache.o cifsbrowse.o cifsmod.o cifs.o datacache.o dgsocket.o\ dircache.o fileattr.o fileattrdos.o fileattrunix.o file.o licman.o\ @@ -17,7 +17,7 @@ pslsslsocket.o pwhash.o raprpc.o server.o share.o smb.o uirep.o\ user.o userdb.o -PROGRAM = $(ROOT)libs/cifs.a +PROGRAM = $(SRCROOT)libs/cifs.a all: $(PROGRAM) --- ./source/backends/cifs/cifsmod.c Mon Jun 3 17:58:17 2002 +++ ../Sharity.2.7/./source/backends/cifs/cifsmod.c Sat Jun 8 17:20:04 2002 @@ -1238,8 +1238,10 @@ { btu8 **cfgPathes[] = {NULL, NULL}; btu8 *hPath[] = {CIFS_CONFIG_SECTION, "servers", NULL}; -btu8 **hPathes[] = {hPath, NULL}; +btu8 **hPathes[2]; /* = {hPath, NULL}; */ + hPathes[0] = hPath; + hPathes[1] = NULL; /* NULL terminate data section of frontendModuleNames array: */ arrAddObject(frontendModuleNames, NULL); arrRemoveLastObject(frontendModuleNames); --- ./source/backends/Makefile Tue Apr 13 11:48:02 1999 +++ ../Sharity.2.7/./source/backends/Makefile Sat Jun 8 16:51:58 2002 @@ -13,7 +13,7 @@ SUBDIRS = dummyFs cifs all: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done clean: - for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ ROOT="../$(ROOT)") || exit 1; done + for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) $@ SRCROOT="../$(SRCROOT)") || exit 1; done --- ./source/backends/dummyFs/Makefile Tue Apr 13 11:48:11 1999 +++ ../Sharity.2.7/./source/backends/dummyFs/Makefile Sat Jun 8 16:52:10 2002 @@ -7,13 +7,13 @@ # For details of the license see the file doc/License.txt. # This Revision: $Id: Makefile,v 1.2 1999/04/13 15:48:11 cs Exp $ -include $(ROOT)Makefile.config +include $(SRCROOT)Makefile.config -INCLUDEFLAGS = -I. -I$(ROOT)mainFramework -I$(ROOT)foundation +INCLUDEFLAGS = -I. -I$(SRCROOT)mainFramework -I$(SRCROOT)foundation OBJ = dummyfsmod.o -PROGRAM = $(ROOT)libs/dummyfs.a +PROGRAM = $(SRCROOT)libs/dummyfs.a all: $(PROGRAM)