diff options
author | markm <markm@FreeBSD.org> | 1998-09-23 06:05:28 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 1998-09-23 06:05:28 +0000 |
commit | c1d85cb5430b3d33a46aac9c07ae66353490e5f9 (patch) | |
tree | b92fb5bd41c2e4512bc2ffad468ec93e8e2d4dfe /gnu | |
parent | c241d61f20b8569d3c69dd034b5eae314034284d (diff) | |
download | FreeBSD-src-c1d85cb5430b3d33a46aac9c07ae66353490e5f9.zip FreeBSD-src-c1d85cb5430b3d33a46aac9c07ae66353490e5f9.tar.gz |
More make cleanups.
1) Part of the NOSHARED fix; I messed this up and managed to get
perl installed without being linked to the shared library libperl.so.
This broke Perl in ELF when linking in shared objects.
2) Start of a cleanup of the man3 page location. This will (eventually)
allow for a the ports to put their pages in the "normal" ${PREFIX}-
based location.
3) Nuke cruft.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 3 | ||||
-rw-r--r-- | gnu/usr.bin/perl/perl/Makefile | 4 | ||||
-rwxr-xr-x | gnu/usr.bin/perl/perl/install_perl_libs | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index 1bbfb73..2b8981e 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -1,11 +1,12 @@ # -# $Id: Makefile,v 1.3 1998/09/12 19:16:33 markm Exp $ +# $Id: Makefile,v 1.4 1998/09/16 17:25:52 markm Exp $ # PROG= miniperl NOMAN= true CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} SRCS= miniperlmain.c config.h +NOSHARED= yes DPADD= ${LIBPERL} ${LIBM} ${LIBCRYPT} LDADD= -lperl -lm -lcrypt diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 18a4338..0479fbc 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.12 1998/09/16 17:25:52 markm Exp $ +# $Id: Makefile,v 1.13 1998/09/22 12:00:58 markm Exp $ # PROG= perl @@ -31,8 +31,6 @@ ${PROG}: Config.pm lib/auto/DynaLoader/DynaLoader.a lib/auto/DynaLoader/DynaLoader.a: Config.pm autosplit -.ORDER: ${STATIC_EXT} ${DYNAMIC_EXT} ${NONXS_EXT} - config.h: config_h.sh config.sh sh config_h.sh diff --git a/gnu/usr.bin/perl/perl/install_perl_libs b/gnu/usr.bin/perl/perl/install_perl_libs index 7951efa..aa2c0f5 100755 --- a/gnu/usr.bin/perl/perl/install_perl_libs +++ b/gnu/usr.bin/perl/perl/install_perl_libs @@ -4,7 +4,7 @@ # This was perl 5.00502's installperl, very thoroughly hacked to only # install the perl libraries. # -# $Id$ +# $Id: install_perl_libs,v 1.1 1998/09/09 07:20:26 markm Exp $ # BEGIN { @@ -55,9 +55,9 @@ die "Patchlevel of perl ($patchlevel)", # Fetch some frequently-used items from %Config my $installprivlib = $destdir . $Config{installprivlib}; my $installarchlib = $destdir . $Config{installarchlib}; -my $man1dir = $Config{man1dir}; +my $man1dir = $destdir . $Config{man1dir}; my $man1ext = $Config{man1ext}; -my $man3dir = $Config{man3dir}; +my $man3dir = $destdir . $Config{man3dir}; my $man3ext = $Config{man3ext}; my $libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. |