Index: ossp-pkg/pth/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/pth/ChangeLog,v rcsdiff -q -kk '-r1.532' '-r1.533' -u '/v/ossp/cvs/ossp-pkg/pth/ChangeLog,v' 2>/dev/null --- ChangeLog 2000/10/03 09:26:47 1.532 +++ ChangeLog 2000/10/05 12:28:06 1.533 @@ -19,7 +19,12 @@ | ||__ _| __|_(_) |_|_____________________________________________________________ - Changes between 1.4a3 and 1.4a4 (29-Jul-2000 to xx-Sep-2000) + Changes between 1.4a3 and 1.4a4 (29-Jul-2000 to xx-Oct-2000) + + *) Added support to Makefile.in for DESTDIR variable. This allows + easier rolling of installation tarballs (for instance from within + RPM or similar facilities) by using "make install DESTDIR=/tmp/pth". + [Brad Smith ] *) Implemented a pth_system(3) function which is a thread-aware clone of the POSIX system(2) function. Index: ossp-pkg/pth/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/pth/ChangeLog,v rcsdiff -q -kk '-r1.533' '-r1.534' -u '/v/ossp/cvs/ossp-pkg/pth/ChangeLog,v' 2>/dev/null --- ChangeLog 2000/10/05 12:28:06 1.533 +++ ChangeLog 2000/10/05 12:28:19 1.534 @@ -24,7 +24,7 @@ *) Added support to Makefile.in for DESTDIR variable. This allows easier rolling of installation tarballs (for instance from within RPM or similar facilities) by using "make install DESTDIR=/tmp/pth". - [Brad Smith ] + [Brad Smith , Ralf S. Engelschall] *) Implemented a pth_system(3) function which is a thread-aware clone of the POSIX system(2) function. Index: ossp-pkg/pth/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/pth/Makefile.in,v rcsdiff -q -kk '-r1.140' '-r1.141' -u '/v/ossp/cvs/ossp-pkg/pth/Makefile.in,v' 2>/dev/null --- Makefile.in 2000/07/01 12:40:50 1.140 +++ Makefile.in 2000/10/05 12:28:06 1.141 @@ -45,6 +45,8 @@ mandir = @mandir@ datadir = @datadir@ +DESTDIR = + ## ## ____ TOOL DEFINITIONS ___________________________________________ ## @@ -54,6 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I. CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ +MKFLAGS = $(MFLAGS) DESTDIR=$(DESTDIR) LIBS = @LIBS@ SHTOOL = $(srcdir)/shtool LIBTOOL = $(C)libtool @@ -155,7 +158,7 @@ all: all-normal all-normal: $(TARGET_ALL) @touch .done-all - @$(MAKE) $(MFLAGS) what-next + @$(MAKE) $(MKFLAGS) what-next all-for-install: $(TARGET_ALL) @touch .done-all @@ -211,61 +214,61 @@ # install the package install: all-for-install - @$(MAKE) $(MFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ + @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ @touch .done-install - @$(MAKE) $(MFLAGS) what-next + @$(MAKE) $(MKFLAGS) what-next install-dirs: - $(SHTOOL) mkdir -f -p -m 755 $(prefix) - $(SHTOOL) mkdir -f -p -m 755 $(bindir) - $(SHTOOL) mkdir -f -p -m 755 $(includedir) - $(SHTOOL) mkdir -f -p -m 755 $(libdir) - $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man1 - $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man3 - $(SHTOOL) mkdir -f -p -m 755 $(datadir)/aclocal + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix) + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir) + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir) + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal install-pth: - $(SHTOOL) install -c -m 755 pth-config $(bindir)/pth-config - $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(mandir)/man1/pth-config.1 - $(SHTOOL) install -c -m 644 $(S)pth.3 $(mandir)/man3/pth.3 - $(SHTOOL) install -c -m 644 $(S)pth.m4 $(datadir)/aclocal/pth.m4 - $(SHTOOL) install -c -m 644 pth.h $(includedir)/pth.h + $(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config + $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1 + $(SHTOOL) install -c -m 644 $(S)pth.3 $(DESTDIR)$(mandir)/man3/pth.3 + $(SHTOOL) install -c -m 644 $(S)pth.m4 $(DESTDIR)$(datadir)/aclocal/pth.m4 + $(SHTOOL) install -c -m 644 pth.h $(DESTDIR)$(includedir)/pth.h @umask 022; $(LIBTOOL) --mode=install \ - $(SHTOOL) install -c libpth.la $(libdir)/libpth.la + $(SHTOOL) install -c libpth.la $(DESTDIR)$(libdir)/libpth.la install-pthread: - $(SHTOOL) install -c -m 755 pthread-config $(bindir)/pthread-config - $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(mandir)/man1/pthread-config.1 - $(SHTOOL) install -c -m 644 pthread.h $(includedir)/pthread.h - $(SHTOOL) install -c -m 644 $(S)pthread.3 $(mandir)/man3/pthread.3 + $(SHTOOL) install -c -m 755 pthread-config $(DESTDIR)$(bindir)/pthread-config + $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(DESTDIR)$(mandir)/man1/pthread-config.1 + $(SHTOOL) install -c -m 644 pthread.h $(DESTDIR)$(includedir)/pthread.h + $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3 @umask 022; $(LIBTOOL) --mode=install \ - $(SHTOOL) install -c libpthread.la $(libdir)/libpthread.la + $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la # uninstall the package uninstall: - @$(MAKE) $(MFLAGS) @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs + @$(MAKE) $(MKFLAGS) @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs @touch .done-uninstall - @$(MAKE) $(MFLAGS) what-next + @$(MAKE) $(MKFLAGS) what-next uninstall-pthread: - $(RM) $(bindir)/pthread-config - $(RM) $(mandir)/man1/pthread-config.1 - $(RM) $(includedir)/pthread.h - $(RM) $(mandir)/man3/pthread.3 - @$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libpthread.la + $(RM) $(DESTDIR)$(bindir)/pthread-config + $(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1 + $(RM) $(DESTDIR)$(includedir)/pthread.h + $(RM) $(DESTDIR)$(mandir)/man3/pthread.3 + @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpthread.la uninstall-pth: - $(RM) $(bindir)/pth-config - $(RM) $(mandir)/man1/pth-config.1 - $(RM) $(mandir)/man3/pth.3 - $(RM) $(datadir)/aclocal/pth.m4 - $(RM) $(includedir)/pth.h - @$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libpth.la + $(RM) $(DESTDIR)$(bindir)/pth-config + $(RM) $(DESTDIR)$(mandir)/man1/pth-config.1 + $(RM) $(DESTDIR)$(mandir)/man3/pth.3 + $(RM) $(DESTDIR)$(datadir)/aclocal/pth.m4 + $(RM) $(DESTDIR)$(includedir)/pth.h + @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpth.la uninstall-dirs: - -$(RMDIR) $(datadir)/aclocal >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(datadir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(mandir)/man1 >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(mandir)/man3 >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(mandir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(libdir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(includedir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(bindir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(prefix) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(datadir)/aclocal >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(datadir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(mandir)/man3 >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE) # clean the source tree for re-building clean: @@ -336,9 +339,9 @@ echo "the list of successfully tested platforms (see PORTING file):"; \ echo ""; \ $(SHTOOL) echo -e "Pth: %BOK%b: %B$(PLATFORM)%b | %B$(PTH_MCTX_ID)%b | %B$(PTH_STACK_GROWTH)%b | %B$$VERSION%b"; \ - $(MAKE) $(MFLAGS) what-next WHEN="Then"; \ + $(MAKE) $(MKFLAGS) what-next WHEN="Then"; \ else \ - $(MAKE) $(MFLAGS) what-next WHEN="Now"; \ + $(MAKE) $(MKFLAGS) what-next WHEN="Now"; \ fi; \ exit 0; \ else \ @@ -403,7 +406,7 @@ # update build tools update-tools: @$(RM) shtool ltmain.sh ltconfig - @$(MAKE) $(MFLAGS) shtool ltmain.sh ltconfig + @$(MAKE) $(MKFLAGS) shtool ltmain.sh ltconfig shtool: shtoolize -o shtool echo version scpp mkdir install fixperm tarball ltmain.sh: Index: ossp-pkg/pth/PORTING RCS File: /v/ossp/cvs/ossp-pkg/pth/PORTING,v rcsdiff -q -kk '-r1.180' '-r1.181' -u '/v/ossp/cvs/ossp-pkg/pth/PORTING,v' 2>/dev/null --- PORTING 2000/08/18 09:50:50 1.180 +++ PORTING 2000/10/05 12:28:06 1.181 @@ -15,7 +15,7 @@ (and should automatically adjust to other platforms, of course): __PLATFORM_ID_______________________ __MACHINE_CONTEXT__ __STACK__ __VERSION__ - i686-pc-freebsd3.4 | sjlj/ssjlj/sas | down | 1.3.0 [DEV] + i686-pc-freebsd3.4 | sjlj/ssjlj/sas | down | 1.3.0 i586-pc-freebsd3.1 | sjlj/ssjlj/sas | down | 1.3.3 i686-pc-freebsd3.1 | sjlj/ssjlj/sas | down | 1.3.0 i586-pc-freebsd3.2 | sjlj/ssjlj/sas | down | 1.2.0 @@ -31,8 +31,8 @@ i586-pc-freebsd4.0 | sjlj/ssjlj/sas | down | 1.3b2 i586-pc-freebsd4.1 | sjlj/ssjlj/sas | down | 1.3.7 i686-pc-freebsd4.1 | sjlj/ssjlj/sas | down | 1.4a3 + i686-pc-freebsd4.1.1 | sjlj/ssjlj/sas | down | 1.4a4 [DEV] i586-pc-freebsd5.0 | sjlj/ssjlj/sas | down | 1.3.4 - i686-pc-freebsd2.2.8 | sjlj/ssjlj/sas | down | 1.2.0 alpha-unknown-freebsd4.0 | sjlj/ssjlj/sas | down | 1.3.0 alpha-unknown-freebsd5.0 | sjlj/ssjlj/sas | down | 1.3.5 powerpc-unknown-netbsd | sjlj/ssjlj/sas | down | 1.3.2