Sat May 7 10:03:25 2016 UTC ()
Fix gp linking to not include the temporary DESTDIR. Bump revision.


(joerg)
diff -r1.67 -r1.68 pkgsrc/math/pari/Makefile
diff -r1.24 -r1.25 pkgsrc/math/pari/distinfo
diff -r1.1 -r1.2 pkgsrc/math/pari/patches/patch-config_Makefile.SH
cvs diff -r1.67 -r1.68 pkgsrc/math/pari/Makefile (switch to unified diff)

--- pkgsrc/math/pari/Makefile 2016/03/03 13:28:22 1.67
+++ pkgsrc/math/pari/Makefile 2016/05/07 10:03:25 1.68
@@ -1,53 +1,54 @@ @@ -1,53 +1,54 @@
1# $NetBSD: Makefile,v 1.67 2016/03/03 13:28:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.68 2016/05/07 10:03:25 joerg Exp $
2 2
3DISTNAME= pari-2.7.5 3DISTNAME= pari-2.7.5
 4PKGREVISION= 1
4CATEGORIES= math 5CATEGORIES= math
5MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ 6MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://pari.math.u-bordeaux.fr/ 9HOMEPAGE= http://pari.math.u-bordeaux.fr/
9COMMENT= Software package for computer-aided number theory 10COMMENT= Software package for computer-aided number theory
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
13 14
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= gmake perl:run 16USE_TOOLS+= gmake perl:run
16USE_LANGUAGES+= c c++ 17USE_LANGUAGES+= c c++
17HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
18CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} 19CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
19CONFIGURE_ENV+= PERL5=${PERL5:Q} 20CONFIGURE_ENV+= PERL5=${PERL5:Q}
20 21
21CONFIGURE_SCRIPT= ${WRKSRC}/Configure 22CONFIGURE_SCRIPT= ${WRKSRC}/Configure
22CONFIGURE_ARGS+= --prefix=${PREFIX} 23CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 24CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1
24CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share 25CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share
25 26
26REPLACE_PERL+= src/desc/PARI/822.pm 27REPLACE_PERL+= src/desc/PARI/822.pm
27REPLACE_PERL+= doc/gphelp 28REPLACE_PERL+= doc/gphelp
28REPLACE_PERL+= misc/tex2mail 29REPLACE_PERL+= misc/tex2mail
29 30
30BUILD_TARGET= all 31BUILD_TARGET= all
31TEST_TARGET= test-compat bench 32TEST_TARGET= test-compat bench
32INSTALL_TARGET= install 33INSTALL_TARGET= install
33 34
34SUBST_CLASSES+= fix-cfg 35SUBST_CLASSES+= fix-cfg
35SUBST_STAGE.fix-cfg= pre-configure 36SUBST_STAGE.fix-cfg= pre-configure
36SUBST_MESSAGE.fix-cfg= Adding CFLAGS to Configure scripts. 37SUBST_MESSAGE.fix-cfg= Adding CFLAGS to Configure scripts.
37SUBST_FILES.fix-cfg= config/get_* 38SUBST_FILES.fix-cfg= config/get_*
38SUBST_SED.fix-cfg= -e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g' 39SUBST_SED.fix-cfg= -e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g'
39 40
40SUBST_CLASSES+= fix-wrap 41SUBST_CLASSES+= fix-wrap
41SUBST_STAGE.fix-wrap= post-build 42SUBST_STAGE.fix-wrap= post-build
42SUBST_MESSAGE.fix-wrap= Removing TOOLS_DIR references 43SUBST_MESSAGE.fix-wrap= Removing TOOLS_DIR references
43SUBST_FILES.fix-wrap= */pari.cfg 44SUBST_FILES.fix-wrap= */pari.cfg
44SUBST_SED.fix-wrap= -e "s,${TOOLS_DIR}/bin/,,g" 45SUBST_SED.fix-wrap= -e "s,${TOOLS_DIR}/bin/,,g"
45 46
46pre-install: replace-interpreter 47pre-install: replace-interpreter
47 48
48.include "options.mk" 49.include "options.mk"
49 50
50.include "../../devel/ncurses/buildlink3.mk" 51.include "../../devel/ncurses/buildlink3.mk"
51# rl_save_prompt() 52# rl_save_prompt()
52.include "../../devel/readline/buildlink3.mk" 53.include "../../devel/readline/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/math/pari/distinfo (switch to unified diff)

--- pkgsrc/math/pari/distinfo 2016/03/03 13:28:22 1.24
+++ pkgsrc/math/pari/distinfo 2016/05/07 10:03:25 1.25
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.24 2016/03/03 13:28:22 wiz Exp $ 1$NetBSD: distinfo,v 1.25 2016/05/07 10:03:25 joerg Exp $
2 2
3SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2 3SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2
4RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce 4RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce
5SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41 5SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41
6Size (pari-2.7.5.tar.gz) = 3159103 bytes 6Size (pari-2.7.5.tar.gz) = 3159103 bytes
7SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157 7SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157
8SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea 8SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea
9SHA1 (patch-config_Makefile.SH) = d1754104438aa0a4d6f86c809d81300ecb3aa3f2 9SHA1 (patch-config_Makefile.SH) = 1b653ec4b506637e5e63b63ec58035912749bef4
10SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a 10SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a
11SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44 11SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44
12SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918 12SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918
13SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86 13SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86
14SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78 14SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78
15SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42 15SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42
16SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134 16SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134
17SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343 17SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343
18SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee 18SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee
19SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111 19SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111
20SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8 20SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8
21SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6 21SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6
22SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f 22SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f
23SHA1 (patch-src_language_parsec.h) = 5cf4772aa2c9d7c912e68f2638bbc99de2d388a6 23SHA1 (patch-src_language_parsec.h) = 5cf4772aa2c9d7c912e68f2638bbc99de2d388a6
24SHA1 (patch-src_modules_mpqs.c) = 54adabc5bffe06ebbb79f3dd6366a4e7e219a676 24SHA1 (patch-src_modules_mpqs.c) = 54adabc5bffe06ebbb79f3dd6366a4e7e219a676
cvs diff -r1.1 -r1.2 pkgsrc/math/pari/patches/patch-config_Makefile.SH (switch to unified diff)

--- pkgsrc/math/pari/patches/patch-config_Makefile.SH 2016/03/03 13:28:22 1.1
+++ pkgsrc/math/pari/patches/patch-config_Makefile.SH 2016/05/07 10:03:25 1.2
@@ -1,240 +1,240 @@ @@ -1,240 +1,240 @@
1$NetBSD: patch-config_Makefile.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $ 1$NetBSD: patch-config_Makefile.SH,v 1.2 2016/05/07 10:03:25 joerg Exp $
2 2
3--- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000 3--- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000
4+++ config/Makefile.SH 4+++ config/Makefile.SH
5@@ -52,8 +52,6 @@ case "$osname" in 5@@ -52,8 +52,6 @@ case "$osname" in
6 dlld_ignore=- ;; 6 dlld_ignore=- ;;
7 mingw) 7 mingw)
8 export_file='$(LIBPARI).def';; 8 export_file='$(LIBPARI).def';;
9- darwin) 9- darwin)
10- ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";; 10- ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";;
11 esac 11 esac
12 case "$osname" in 12 case "$osname" in
13 mingw|cygwin) 13 mingw|cygwin)
14@@ -93,7 +91,7 @@ plotrunpath= 14@@ -93,7 +91,7 @@ plotrunpath=
15 case "$which_graphic_lib" in 15 case "$which_graphic_lib" in
16 *X11*) 16 *X11*)
17 PLOTCFLAGS="$PLOTCFLAGS $X11_INC" 17 PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
18- PLOTLIBS="$PLOTLIBS $X11_LIBS" 18- PLOTLIBS="$PLOTLIBS $X11_LIBS"
19+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS" 19+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
20 plotrunpath=$X11 20 plotrunpath=$X11
21 graph="plotX $graph" 21 graph="plotX $graph"
22 ;; 22 ;;
23@@ -134,20 +132,11 @@ if test -n "$runpathprefix"; then 23@@ -134,20 +132,11 @@ if test -n "$runpathprefix"; then
24 RUNPTH=`$config_dir/ldflags "$LDneedsWl" $runpathprefix\\\$\(TOPDIR\)/$objdir$dir_sep"$tmp"` 24 RUNPTH=`$config_dir/ldflags "$LDneedsWl" $runpathprefix\\\$\(TOPDIR\)/$objdir$dir_sep"$tmp"`
25 fi 25 fi
26  26
27-if test -z "$DLLD"; then 27-if test -z "$DLLD"; then
28- exec="gp-sta"; static=y 28- exec="gp-sta"; static=y
29-else 29-else
30- exec="gp-sta gp-dyn" 30- exec="gp-sta gp-dyn"
31-fi 31-fi
32 case "$sizeof_long" in 32 case "$sizeof_long" in
33 4) numbits=32;; 33 4) numbits=32;;
34 8) numbits=64;; 34 8) numbits=64;;
35 esac 35 esac
36 dotest="env \"RUNTEST=\$(RUNTEST)\" \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits" 36 dotest="env \"RUNTEST=\$(RUNTEST)\" \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
37-case "$static" in 37-case "$static" in
38- n) dft=dyn; libdft=lib-dyn;; 38- n) dft=dyn; libdft=lib-dyn;;
39- y) dft=sta; libdft= ;; 39- y) dft=sta; libdft= ;;
40-esac 40-esac
41  41
42 CPPFLAGS="-I. -I$src/headers" 42 CPPFLAGS="-I. -I$src/headers"
43 if test "$has_dlopen" = builtin; then 43 if test "$has_dlopen" = builtin; then
44@@ -176,16 +165,16 @@ RANLIB = ranlib 44@@ -176,16 +165,16 @@ RANLIB = ranlib
45 SIZEOF_LONG= $sizeof_long 45 SIZEOF_LONG= $sizeof_long
46  46
47 CC_FLAVOR = 47 CC_FLAVOR =
48-CC = $CC \$(CC_FLAVOR) 48-CC = $CC \$(CC_FLAVOR)
49+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR) 49+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
50 CPPFLAGS = $CPPFLAGS 50 CPPFLAGS = $CPPFLAGS
51 CFLAGS = $CFLAGS 51 CFLAGS = $CFLAGS
52 DLCFLAGS = $DLCFLAGS 52 DLCFLAGS = $DLCFLAGS
53 KERNELCFLAGS = $KERNELCFLAGS 53 KERNELCFLAGS = $KERNELCFLAGS
54 LD_FLAVOR = \$(CC_FLAVOR) 54 LD_FLAVOR = \$(CC_FLAVOR)
55-LD = $LD \$(LD_FLAVOR) 55-LD = $LD \$(LD_FLAVOR)
56+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR) 56+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
57 LDFLAGS = $LDFLAGS 57 LDFLAGS = $LDFLAGS
58 DLLD_FLAVOR = \$(LD_FLAVOR) 58 DLLD_FLAVOR = \$(LD_FLAVOR)
59-DLLD = $DLLD \$(DLLD_FLAVOR) 59-DLLD = $DLLD \$(DLLD_FLAVOR)
60+DLLD = \$(LIBTOOL) --mode=link $DLLD \$(DLLD_FLAVOR) 60+DLLD = \$(LIBTOOL) --mode=link $DLLD \$(DLLD_FLAVOR)
61 DLLDFLAGS = $DLLDFLAGS 61 DLLDFLAGS = $DLLDFLAGS
62 EXTRADLLDFLAGS = $EXTRADLLDFLAGS 62 EXTRADLLDFLAGS = $EXTRADLLDFLAGS
63 RUNTEST = $RUNTEST 63 RUNTEST = $RUNTEST
64@@ -204,18 +193,12 @@ RUNTEST = $RUNTEST 64@@ -204,18 +193,12 @@ RUNTEST = $RUNTEST
65 #the following line 65 #the following line
66 #GMPO2 = \$(GMP)/sparcv9.o 66 #GMPO2 = \$(GMP)/sparcv9.o
67  67
68-_O = .o 68-_O = .o
69-_A = .a 69-_A = .a
70+_O = .lo 70+_O = .lo
71+_A = .la 71+_A = .la
72 LIB_PREFIX = $lib_prefix 72 LIB_PREFIX = $lib_prefix
73 DLLIB_PREFIX = $dllib_prefix 73 DLLIB_PREFIX = $dllib_prefix
74-LIBPARI_BASE = $libpari_base 74-LIBPARI_BASE = $libpari_base
75-LIBPARI = \$(LIB_PREFIX)pari 75-LIBPARI = \$(LIB_PREFIX)pari
76-DLLIBPARI = \$(DLLIB_PREFIX)pari 76-DLLIBPARI = \$(DLLIB_PREFIX)pari
77-LIBPARI_STA = \$(LIBPARI)\$(_A) 77-LIBPARI_STA = \$(LIBPARI)\$(_A)
78-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX 78-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
79-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX 79-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
80-LIBPARI_DYN = \$(SOLIBPARI)$sodest 80-LIBPARI_DYN = \$(SOLIBPARI)$sodest
81-LIBPARI_SONAME= \$(SOLIBPARI)$soname 81-LIBPARI_SONAME= \$(SOLIBPARI)$soname
82+LIBPARI_BASE = $eibpari_base 82+LIBPARI_BASE = $eibpari_base
83+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A) 83+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
84 DL_DFLT_NAME = $DL_DFLT_NAME 84 DL_DFLT_NAME = $DL_DFLT_NAME
85  85
86 LD_INSTALL_NAME = $ld_install_name 86 LD_INSTALL_NAME = $ld_install_name
87@@ -289,21 +272,15 @@ OBJSGP = $OBJSGP 87@@ -289,21 +272,15 @@ OBJSGP = $OBJSGP
88  88
89 .PHONY: gp dft clean 89 .PHONY: gp dft clean
90  90
91-gp: gp-$dft ../gp$suffix$exe_suff $libdft 91-gp: gp-$dft ../gp$suffix$exe_suff $libdft
92- 92-
93-../gp$suffix$exe_suff: gp-$dft 93-../gp$suffix$exe_suff: gp-$dft
94- -\$(RM) \$@ 94- -\$(RM) \$@
95- -\$(LN) $ln_objdir/gp-$dft \$@ 95- -\$(LN) $ln_objdir/gp-$dft \$@
96- 96-
97-all: $exec lib-sta 97-all: $exec lib-sta
98+gp: \$(OBJSGP) \$(LIBPARI) 98+gp: \$(OBJSGP) \$(LIBPARI)
99+ \$(RM) \$@ 99+ \$(RM) \$@
100+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) 100+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
101  101
102-lib-sta: \$(LIBPARI_STA) 102-lib-sta: \$(LIBPARI_STA)
103-lib-dyn: \$(LIBPARI_DYN) 103-lib-dyn: \$(LIBPARI_DYN)
104+all: gp \$(LIBPARI) 104+all: gp \$(LIBPARI)
105+lib: \$(LIBPARI) 105+lib: \$(LIBPARI)
106  106
107-\$(LIBPARI_STA): $add_funclist \$(OBJS) 107-\$(LIBPARI_STA): $add_funclist \$(OBJS)
108- -\$(RM) \$@ 108- -\$(RM) \$@
109- \$(AR) r \$@ \$(OBJS) 109- \$(AR) r \$@ \$(OBJS)
110- -\$(RANLIB) \$@ 110- -\$(RANLIB) \$@
111+\$(LIBPARI): \$(OBJS) 111+\$(LIBPARI): \$(OBJS)
112+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) \$(GMPLIBS) --version-info 0:0 112+ \$(LD) -o \$@ \$(OBJS) -rpath \$(PREFIX)/lib \$(GMPLIBS) --version-info 0:0
113  113
114 kerntest\$(_O): $src/test/kerntest.c 114 kerntest\$(_O): $src/test/kerntest.c
115 \$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c 115 \$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c
116@@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN) 116@@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN)
117 tune-sta: tune\$(_O) \$(LIBPARI_STA) 117 tune-sta: tune\$(_O) \$(LIBPARI_STA)
118 \$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS) 118 \$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS)
119  119
120-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP) 120-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
121- \$(RM) \$@ 121- \$(RM) \$@
122- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS) 122- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS)
123- $postconfig gp-sta 123- $postconfig gp-sta
124- 124-
125 cleantest: 125 cleantest:
126 \$(RM) *.dif gp.out io-testfile pari.ps 126 \$(RM) *.dif gp.out io-testfile pari.ps
127 cleanobj: 127 cleanobj:
128@@ -364,7 +336,7 @@ clean: cleanall 128@@ -364,7 +336,7 @@ clean: cleanall
129 .headers: $HEADERS 129 .headers: $HEADERS
130 @touch \$@ 130 @touch \$@
131  131
132-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg 132-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg
133+install-nodata: install-lib install-include install-bin install-man install-misc install-examples install-cfg 133+install-nodata: install-lib install-include install-bin install-man install-misc install-examples install-cfg
134  134
135 install: install-nodata install-data 135 install: install-nodata install-data
136  136
137@@ -377,37 +349,19 @@ install-include: 137@@ -377,37 +349,19 @@ install-include:
138 -\$(RM) \$(INCLUDEDIR)/pari/genpari.h 138 -\$(RM) \$(INCLUDEDIR)/pari/genpari.h
139 -\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h 139 -\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
140  140
141-install-bin: install-bin-$dft 141-install-bin: install-bin-$dft
142- 142-
143-install-bin-dyn: gp-dyn install-lib-dyn 143-install-bin-dyn: gp-dyn install-lib-dyn
144+install-bin: gp 144+install-bin: gp
145 -mkdir -p \$(BINDIR) 145 -mkdir -p \$(BINDIR)
146- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff 146- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
147- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff -L\$(LIBDIR) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(LDDYN) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS) 147- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff -L\$(LIBDIR) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(LDDYN) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
148- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff 148- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
149- -cd \$(BINDIR); $postconfig gp-$version$exe_suff 149- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
150- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff 150- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
151- 151-
152-install-bin-sta: gp-sta 152-install-bin-sta: gp-sta
153- -mkdir -p \$(BINDIR) 153- -mkdir -p \$(BINDIR)
154- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff 154- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
155- \$(INSTALL_PROGRAM) gp-sta \$(BINDIR)/gp-$version$exe_suff 155- \$(INSTALL_PROGRAM) gp-sta \$(BINDIR)/gp-$version$exe_suff
156- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff 156- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
157-# Can't strip it if we want install() to work on OSF. 157-# Can't strip it if we want install() to work on OSF.
158-# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version 158-# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
159- -cd \$(BINDIR); $postconfig gp-$version$exe_suff 159- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
160+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff 160+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
161  161
162 install-man:: 162 install-man::
163 -mkdir -p \$(MANDIR) 163 -mkdir -p \$(MANDIR)
164 -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1 164 -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
165- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR) 165- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
166 \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1 166 \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
167 -\$(LN) gp.1 \$(MANDIR)/pari.1 167 -\$(LN) gp.1 \$(MANDIR)/pari.1
168 -\$(LN) gp-$version.1 \$(MANDIR)/gp.1 168 -\$(LN) gp-$version.1 \$(MANDIR)/gp.1
169  169
170 install-misc: 170 install-misc:
171 -mkdir -p \$(MISCDIR) \$(BINDIR) 171 -mkdir -p \$(MISCDIR) \$(BINDIR)
172- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR) 172- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
173- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR) 173- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
174 \$(INSTALL_DATA) $misc/README \$(MISCDIR) 174 \$(INSTALL_DATA) $misc/README \$(MISCDIR)
175 \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR) 175 \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
176 \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR) 176 \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
177@@ -426,7 +380,6 @@ install-cfg:: 177@@ -426,7 +380,6 @@ install-cfg::
178 install-doc:: 178 install-doc::
179 -mkdir -p \$(BINDIR) \$(DOCDIR) 179 -mkdir -p \$(BINDIR) \$(DOCDIR)
180 -cd $doc; \$(MAKE) all 180 -cd $doc; \$(MAKE) all
181- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR) 181- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
182 -\$(INSTALL_DATA) $doc/translations \$(DOCDIR) 182 -\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
183 -\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR) 183 -\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
184 -\$(INSTALL_DATA) $doc/appb.tex \$(DOCDIR) 184 -\$(INSTALL_DATA) $doc/appb.tex \$(DOCDIR)
185@@ -443,12 +396,11 @@ install-doc:: 185@@ -443,12 +396,11 @@ install-doc::
186 -\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR) 186 -\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
187 -\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR) 187 -\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
188 -\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR) 188 -\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR)
189- -\$(INSTALL_DATA) $doc/develop.dvi \$(DOCDIR) 189- -\$(INSTALL_DATA) $doc/develop.dvi \$(DOCDIR)
190- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR) 190- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR)
191- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR) 191- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR)
192- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR) 192- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
193- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR) 193- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR)
194- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR) 194- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR)
195+ -\$(INSTALL_DATA) $doc/develop.pdf \$(DOCDIR) 195+ -\$(INSTALL_DATA) $doc/develop.pdf \$(DOCDIR)
196+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR) 196+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR)
197+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR) 197+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR)
198+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR) 198+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
199+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR) 199+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR)
200  200
201 install-docpdf:: 201 install-docpdf::
202 -mkdir -p \$(BINDIR) \$(DOCDIR) 202 -mkdir -p \$(BINDIR) \$(DOCDIR)
203@@ -483,23 +435,9 @@ install-data: 203@@ -483,23 +435,9 @@ install-data:
204 done; \ 204 done; \
205 fi 205 fi
206  206
207-install-lib-sta: \$(LIBPARI_STA) 207-install-lib-sta: \$(LIBPARI_STA)
208- -mkdir -p \$(LIBDIR) 208- -mkdir -p \$(LIBDIR)
209- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA) 209- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
210- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA) 210- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
211- 211-
212-install-lib-dyn-base: 212-install-lib-dyn-base:
213+install-lib: \$(LIBPARI) 213+install-lib: \$(LIBPARI)
214 -mkdir -p \$(LIBDIR) 214 -mkdir -p \$(LIBDIR)
215- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO) 215- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
216- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBDIR)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) \$(LD_INSTALL_NAME) 216- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBDIR)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) \$(LD_INSTALL_NAME)
217- $install_implib 217- $install_implib
218- 218-
219-install-lib-dyn-link: install-lib-dyn-base 219-install-lib-dyn-link: install-lib-dyn-base
220- -if test "\$(LIBPARI_DYN)" != "\$(LIBDIR)/\$(LIBPARI_SO)"; then \ 220- -if test "\$(LIBPARI_DYN)" != "\$(LIBDIR)/\$(LIBPARI_SO)"; then \
221- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi 221- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
222- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \ 222- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
223- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME); fi 223- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME); fi
224-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link 224-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
225+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/ 225+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
226  226
227 nsis: gp 227 nsis: gp
228 -cd $doc; \$(MAKE) docpdf 228 -cd $doc; \$(MAKE) docpdf
229@@ -595,11 +533,6 @@ EOT 229@@ -595,11 +533,6 @@ EOT
230 fi 230 fi
231 cat >> $file << EOT 231 cat >> $file << EOT
232  232
233-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB) 233-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
234- \$(RM) \$@ 234- \$(RM) \$@
235- \$(LD) -o \$@ -L\$(TOPLDDYN) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) 235- \$(LD) -o \$@ -L\$(TOPLDDYN) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
236- $postconfig gp-dyn 236- $postconfig gp-dyn
237- 237-
238 \$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE) 238 \$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
239 -\$(RM) \$(LIBPARI_DYN) 239 -\$(RM) \$(LIBPARI_DYN)
240 \$(DLLD_IGNORE)\$(DLLD) -o \$(TOPLDDYN)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) 240 \$(DLLD_IGNORE)\$(DLLD) -o \$(TOPLDDYN)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE)