diff options
| -rw-r--r-- | Makefile.in | 26 | ||||
| -rw-r--r-- | Perl/Makefile.PL | 7 | ||||
| -rw-r--r-- | Perl/t/zinc.t | 72 | ||||
| -rwxr-xr-x | configure | 190 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 13 | ||||
| -rw-r--r-- | patchlvl.h | 4 |
8 files changed, 193 insertions, 140 deletions
diff --git a/Makefile.in b/Makefile.in index ac0e3af..6d104e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,6 +29,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL = @INSTALL@ +# PERL PATHS +INSTALLARCHLIB = @INSTALLARCHLIB@ +INSTALLPRIVLIB = @INSTALLPRIVLIB@ +INSTALLMAN1DIR = @INSTALLMAN1DIR@ +INSTALLMAN3DIR = @INSTALLMAN3DIR@ + +PERLCONFIG = INSTALLDIRS=perl INSTALLMAN1DIR=$(INSTALLMAN1DIR) INSTALLMAN3DIR=$(INSTALLMAN3DIR) INSTALLPRIVLIB=$(INSTALLPRIVLIB) INSTALLARCHLIB=$(INSTALLARCHLIB) + +INSTALL_PERL = install_perl + prefix = $(HOME) exec_prefix = $(prefix) @@ -56,7 +66,7 @@ CPPFLAGS = @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY #SITEPERL = /usr/local/lib/perl5/site_perl # # Auto -PTKLIB = @PERLLIB@/Tk/pTk +PTKLIB = @INSTALLARCHLIB@/Tk/pTk SITEPERL = @SITEPERL@ PTKCFLAGS = -DPTK -I$(PTKLIB) @@ -126,11 +136,12 @@ ptkzinc: libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_nodebug ptkzinc_debug: libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_debug (cd Perl; make "LD_RUN_PATH=@X_LIBS@") testptk: ptkzinc - (cd Perl; make pure_install; perl -I$(SITEPERL) t/zinc.pl) + (cd Perl; make test "FULLPERL=PERL_DL_NONLAZY=0 perl") Perl/Makefile_nodebug: - (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR) $(PTKLIB)) + (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR) $(PERLCONFIG)) Perl/Makefile_debug: - (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PTKLIB)) + (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PERLCONFIG)) + libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkobjs) libom.so $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(ptkobjs) libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so @@ -176,9 +187,9 @@ installtk: installdirs $(tklibs) cd $(libdir) && rm -f libtkzinc.so for f in $(hfiles); do $(INSTALL_DATA) $$f $(incdir); done -installptk: $(ptklibs) Perl/Makefile_nodebug +installptk: $(ptklibs) $(INSTALL_DATA) $(ptklibs) $(libdir) - (cd Perl; make; make install_perl PREFIX=$(prefix)) + (cd Perl; make; make $(INSTALL_PERL)) installdirs: $(srcdir)/mkinstalldirs $(libdir) $(incdir) $(mandir) @@ -231,4 +242,7 @@ depend: rm -f depends mv depend.temp depends +depends: + touch depends + include depends diff --git a/Perl/Makefile.PL b/Perl/Makefile.PL index 6e1467f..90b521a 100644 --- a/Perl/Makefile.PL +++ b/Perl/Makefile.PL @@ -15,9 +15,4 @@ Tk::MMutil::TkExtMakefile( 'VERSION_FROM' => 'Zinc.pm', 'XS_VERSION' => $Tk::Config::VERSION, 'INC' => "-I. -I$ARGV[1]", - 'LIBS' => "-L/usr/X11R6/lib -L.. -l$ARGV[0] -lX11"); - - - - - + 'LIBS' => ["-L/usr/X11R6/lib -lX11 -L.. -l$ARGV[0]"]); diff --git a/Perl/t/zinc.t b/Perl/t/zinc.t index f345ec2..0d2f1bf 100644 --- a/Perl/t/zinc.t +++ b/Perl/t/zinc.t @@ -1,4 +1,22 @@ -#!/usr/bin/perl +# Before `make install' is performed this script should be runnable with +# `make test'. After `make install' it should work as `perl zinc.t' + +######################### We start with some black magic to print on failure. + +# Change 1..1 below to 1..last_test_to_print . +# (It may become useful if the test is moved to ./t subdirectory.) + +BEGIN { $| = 1; print "1..1\n"; } +END {print "not ok 1\n" unless $loaded;} +use Tk::Zinc; +$loaded = 1; +print "ok 1\n"; + +######################### End of black magic. + +# Insert your test code below (better if it prints "ok 13" +# (correspondingly "not ok 13") depending on the success of chunk 13 +# of the test code): use Tk; @@ -25,7 +43,7 @@ $logo = $mw->Photo(-file => "$image_path/logo.gif"); #MainLoop; exit; $top = 1; $zinc = $mw->Zinc(-backcolor => 'skyblue', -relief => 'sunken'); -$zinc->pack(-expand => t, -fill => 'both'); +$zinc->pack(-expand => 't', -fill => 'both'); $zinc->configure(-width => 800, -height => 500); $color = $zinc->cget("-backcolor"); print "zinc backcolor=$color\n"; @@ -69,7 +87,7 @@ $zinc->itemconfigure($track, 1, -filled => 1 , -backcolor => "green", $zinc->itemconfigure($track, 1, -filled => 1 , -backcolor => "green", -border => "contour"); $zinc->itemconfigure($track, 2, -image => $logo , -alignment => "center"); -$mk = $zinc->itemcget($track, -markercolor); +#$mk = $zinc->itemcget($track, -markercolor); $zinc->itemconfigure($track, 0, -reliefthickness => 2, -relief => "sunken", -bordercolor => "red", -border => "noborder"); @@ -136,14 +154,14 @@ $mw->videomap("load", "$map_path/hegias_parouest_TE.vid", 0, "paris-ouest"); print "videomap ids : ", join('|', $mw->videomap("ids", "$map_path/videomap_orly")),"\n"; -$map = $zinc->add("map", $top, -color => red); -$zinc->itemconfigure($map,-mapinfo => orly); +$map = $zinc->add("map", $top, -color => 'red'); +$zinc->itemconfigure($map,-mapinfo => 'orly'); -$map2 = $zinc->add("map", $top, -color => green, -filled => 1, -priority => 0, - -fillpattern => AlphaStipple6); -#$zinc->itemconfigure($map2, -mapinfo => paris-ouest); +#$map2 = $zinc->add("map", $top, -color => 'green', -filled => 1, -priority => 0, +# -fillpattern => AlphaStipple6); +#$zinc->itemconfigure($map2, -mapinfo => 'paris-ouest'); -$map3 = $zinc->add("map", $top, -color => orange); +$map3 = $zinc->add("map", $top, -color => 'orange'); $zinc->itemconfigure($map3,-mapinfo => "paris-w"); @@ -151,38 +169,38 @@ $zinc->itemconfigure($map3,-mapinfo => "paris-w"); #creation rectangle, arc, curve ################################################### -$rect = $zinc->add(rectangle, $top, [-50, -50, 50, -80], -linecolor => bisque); -$zinc->bind($rect, '<Enter>', sub { $zinc->itemconfigure($rect, -linecolor => red)}); -$zinc->bind($rect, '<Leave>', sub { $zinc->itemconfigure($rect, -linecolor => bisque)}); +$rect = $zinc->add('rectangle', $top, [-50, -50, 50, -80], -linecolor => 'bisque'); +$zinc->bind($rect, '<Enter>', sub { $zinc->itemconfigure($rect, -linecolor => 'red')}); +$zinc->bind($rect, '<Leave>', sub { $zinc->itemconfigure($rect, -linecolor => 'bisque')}); -$arc = $zinc->add(arc, $top, [-100, 80, -50, 30], -linecolor => bisque, +$arc = $zinc->add('arc', $top, [-100, 80, -50, 30], -linecolor => 'bisque', -tags => ["arc"]); #$zinc->addtag("fleche",'withtag', $arc); #$zinc->addtag("carquois",'withtag', $arc); -$zinc->add(rectangle, $top, [-101, 81, -49, 29], -linecolor => green); +$zinc->add('rectangle', $top, [-101, 81, -49, 29], -linecolor => 'green'); $zinc->raise($arc); -$zinc->bind($arc, '<Enter>', sub {$zinc->itemconfigure($arc, -linecolor => red)}); -$zinc->bind($arc, '<Leave>', sub {$zinc->itemconfigure($arc, -linecolor => bisque)}); +$zinc->bind($arc, '<Enter>', sub {$zinc->itemconfigure($arc, -linecolor => 'red')}); +$zinc->bind($arc, '<Leave>', sub {$zinc->itemconfigure($arc, -linecolor => 'bisque')}); print "arc tags=", join('|',$zinc->gettags($arc)),"\n"; $zinc->itemconfigure($arc, -startangle => 0, -extent => 360); -$mp = $zinc->add(curve, $top, [-300, 0, -250, 100, -80, 20]); -$zinc->itemconfigure($mp, -filled => 1, -linewidth => 4, -linecolor => yellow, - -fillcolor => tan, -fillpattern => AlphaStipple8); -$zinc->itemconfigure($mp, -marker => AtcSymbol9 , -markercolor => red); +$mp = $zinc->add('curve', $top, [-300, 0, -250, 100, -80, 20]); +$zinc->itemconfigure($mp, -filled => 1, -linewidth => 4, -linecolor => 'yellow', + -fillcolor => 'tan', -fillpattern => AlphaStipple8); +$zinc->itemconfigure($mp, -marker => AtcSymbol9 , -markercolor => 'red'); ################################################### # Map info ################################################### $mw->mapinfo('mpessai', 'create'); -$mw->mapinfo('mpessai', add, text, normal, simple, 0, 200, "Et voilą"); -$mw->mapinfo(mpessai, add, line, simple, 0, 0, 0, 0, 200); -#$mw->mapinfo('mpessai', add, line, simple, 5, -100, 100, 0, 0); -$zinc->itemconfigure($map3, -mapinfo => mpessai); +$mw->mapinfo('mpessai', 'add', 'text', 'normal', 'simple', 0, 200, "Et voilą"); +$mw->mapinfo('mpessai', 'add', 'line', 'simple', 0, 0, 0, 0, 200); +#$mw->mapinfo('mpessai', 'add', 'line', 'simple', 5, -100, 100, 0, 0); +$zinc->itemconfigure($map3, -mapinfo => 'mpessai'); -print "mapinfo count line : ", $mw->mapinfo(mpessai, count, line),"\n"; -print "mapinfo get line 3: ", join('|',$mw->mapinfo(mpessai, get, line, 0)),"\n"; +print "mapinfo count line : ", $mw->mapinfo('mpessai', 'count', 'line'),"\n"; +print "mapinfo get line 3: ", join('|',$mw->mapinfo('mpessai', 'get', 'line', 0)),"\n"; ################################################### # tests diverses methodes ################################################### @@ -223,3 +241,5 @@ sub finditems { print "--- overlapping --->", join('|',$zinc->find('overlapping',$origx, $origy, $cornerx, $cornery)),"\n\n"; } + +1; @@ -732,9 +732,15 @@ done test -n "$PERL" || PERL="error" -PERLLIB=`perl -e 'print $INC[0]'` +INSTALLARCHLIB=`perl -MConfig -e 'print $Config{installarchlib}'` +INSTALLPRIVLIB=`perl -MConfig -e 'print $Config{installprivlib}'` +INSTALLMAN1DIR=`perl -MConfig -e 'print $Config{installman1dir}'` +INSTALLMAN3DIR=`perl -MConfig -e 'print $Config{installman3dir}'` + + + + -SITEPERL=`find /usr/local -name site_perl` @@ -753,7 +759,7 @@ ZINC_VERSION=`sed -n -e 's/#define ZINCVERSION.*\([0-9][a-z][0-9]\).*/\1/p' patc echo $ac_n "checking for shared library support""... $ac_c" 1>&6 -echo "configure:757: checking for shared library support" >&5 +echo "configure:763: checking for shared library support" >&5 sharedlib_extension=so # right for almost everything sharedlib_suffix='.$(sharedlib_version)' sharedlib_cflags= @@ -855,7 +861,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:859: checking for a BSD compatible install" >&5 +echo "configure:865: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -905,7 +911,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:909: checking how to run the C preprocessor" >&5 +echo "configure:915: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -920,13 +926,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 924 "configure" +#line 930 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -937,13 +943,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 941 "configure" +#line 947 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -968,7 +974,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:972: checking for $ac_word" >&5 +echo "configure:978: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -995,7 +1001,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:999: checking for POSIXized ISC" >&5 +echo "configure:1005: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1016,12 +1022,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1020: checking for ANSI C header files" >&5 +echo "configure:1026: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1025 "configure" +#line 1031 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1029,7 +1035,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1046,7 +1052,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1050 "configure" +#line 1056 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1064,7 +1070,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1068 "configure" +#line 1074 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1085,7 +1091,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1089 "configure" +#line 1095 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1096,7 +1102,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1123,17 +1129,17 @@ for ac_hdr in values.h stddef.h stdarg.h limits.h strings.h string.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1127: checking for $ac_hdr" >&5 +echo "configure:1133: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1132 "configure" +#line 1138 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1163,17 +1169,17 @@ for ac_hdr in unistd.h memory.h stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1167: checking for $ac_hdr" >&5 +echo "configure:1173: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1172 "configure" +#line 1178 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1203,17 +1209,17 @@ for ac_hdr in sys/types.h sys/time.h sys/timeb.h sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1207: checking for $ac_hdr" >&5 +echo "configure:1213: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1212 "configure" +#line 1218 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1242,12 +1248,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1246: checking for $ac_func" >&5 +echo "configure:1252: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1251 "configure" +#line 1257 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1270,7 +1276,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1301,7 +1307,7 @@ done # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1305: checking for X" >&5 +echo "configure:1311: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1363,12 +1369,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 1367 "configure" +#line 1373 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1437,14 +1443,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 1441 "configure" +#line 1447 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1550,17 +1556,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1554: checking whether -R must be followed by a space" >&5 +echo "configure:1560: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 1557 "configure" +#line 1563 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1576,14 +1582,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 1580 "configure" +#line 1586 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1615,7 +1621,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1619: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1625: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1623,7 +1629,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 1627 "configure" +#line 1633 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1634,7 +1640,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1656,7 +1662,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1660: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1666: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1664,7 +1670,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 1668 "configure" +#line 1674 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1675,7 +1681,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1704,12 +1710,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1708: checking for gethostbyname" >&5 +echo "configure:1714: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1713 "configure" +#line 1719 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -1732,7 +1738,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1753,7 +1759,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1757: checking for gethostbyname in -lnsl" >&5 +echo "configure:1763: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1761,7 +1767,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1765 "configure" +#line 1771 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1772,7 +1778,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1802,12 +1808,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1806: checking for connect" >&5 +echo "configure:1812: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1811 "configure" +#line 1817 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -1830,7 +1836,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1851,7 +1857,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1855: checking for connect in -lsocket" >&5 +echo "configure:1861: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1859,7 +1865,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 1863 "configure" +#line 1869 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1870,7 +1876,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1894,12 +1900,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1898: checking for remove" >&5 +echo "configure:1904: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1903 "configure" +#line 1909 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -1922,7 +1928,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1943,7 +1949,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1947: checking for remove in -lposix" >&5 +echo "configure:1953: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1951,7 +1957,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 1955 "configure" +#line 1961 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1962,7 +1968,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1986,12 +1992,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1990: checking for shmat" >&5 +echo "configure:1996: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1995 "configure" +#line 2001 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -2014,7 +2020,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2035,7 +2041,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2039: checking for shmat in -lipc" >&5 +echo "configure:2045: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2043,7 +2049,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2047 "configure" +#line 2053 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2054,7 +2060,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2087,7 +2093,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2091: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2097: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2095,7 +2101,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <<EOF -#line 2099 "configure" +#line 2105 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2106,7 +2112,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2152,7 +2158,7 @@ LIBS="-lX11 $X_EXTRA_LIBS" this_is_not_ok="" XPM="" echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6 -echo "configure:2156: checking for main in -lXpm" >&5 +echo "configure:2162: checking for main in -lXpm" >&5 ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2160,14 +2166,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2164 "configure" +#line 2170 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2197,17 +2203,17 @@ for ac_hdr in X11/xpm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2201: checking for $ac_hdr" >&5 +echo "configure:2207: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2206 "configure" +#line 2212 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2238,12 +2244,12 @@ CPPFLAGS=$TMP_CPPFLAGS LIBS="-lXext -lX11 $X_EXTRA_LIBS" echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2242: checking for working const" >&5 +echo "configure:2248: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2247 "configure" +#line 2253 "configure" #include "confdefs.h" int main() { @@ -2292,7 +2298,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2314,10 +2320,10 @@ fi if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:2318: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2324: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:2321: checking whether cc understands -c and -o together" >&5 +echo "configure:2327: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -2329,16 +2335,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:2341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2504,8 +2510,10 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@CC@%$CC%g s%@PERL@%$PERL%g -s%@PERLLIB@%$PERLLIB%g -s%@SITEPERL@%$SITEPERL%g +s%@INSTALLARCHLIB@%$INSTALLARCHLIB%g +s%@INSTALLPRIVLIB@%$INSTALLPRIVLIB%g +s%@INSTALLMAN1DIR@%$INSTALLMAN1DIR%g +s%@INSTALLMAN3DIR@%$INSTALLMAN3DIR%g s%@ZINC_VER@%$ZINC_VER%g s%@ZINC_MAJOR@%$ZINC_MAJOR%g s%@ZINC_VERSION@%$ZINC_VERSION%g diff --git a/configure.in b/configure.in index 919a520..75d4ce4 100644 --- a/configure.in +++ b/configure.in @@ -13,11 +13,17 @@ AC_CONFIG_HEADER(config.h) AC_PROG_CC AC_CHECK_PROGS(PERL, perl, error) changequote() -PERLLIB=`perl -e 'print $INC[0]'` +INSTALLARCHLIB=`perl -MConfig -e 'print $Config{installarchlib}'` +INSTALLPRIVLIB=`perl -MConfig -e 'print $Config{installprivlib}'` +INSTALLMAN1DIR=`perl -MConfig -e 'print $Config{installman1dir}'` +INSTALLMAN3DIR=`perl -MConfig -e 'print $Config{installman3dir}'` changequote([, ]) -SITEPERL=`find /usr/local -name site_perl` -AC_SUBST(PERLLIB) -AC_SUBST(SITEPERL) + +AC_SUBST(INSTALLARCHLIB) +AC_SUBST(INSTALLPRIVLIB) +AC_SUBST(INSTALLMAN1DIR) +AC_SUBST(INSTALLMAN3DIR) + dnl for shared library stuff # extract version information diff --git a/debian/changelog b/debian/changelog index 3f114ba..3e8572b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zinc-tk (3.1.10) unstable; urgency=low + + * Modifications pour une meilleure configuration de la compil + et du test en Perl. + + -- Patrick Lecoanet <lecoanet@cena.dgac.fr> Fri, 4 Feb 2000 15:42:11 +0100 + zinc-tk (3.1.9) unstable; urgency=low * Passage du nom radar au nom zinc. diff --git a/debian/rules b/debian/rules index 80451a2..e5b09dd 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,11 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)') version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*') +INSTALLARCHLIB=`perl -MConfig -e 'print $$Config{installarchlib}'` + +TMP=`pwd`/debian/tmp + + build: $(checkdir) @@ -15,7 +20,7 @@ build: # which reserves one register; thus, without -fPIC we get more efficient # code). # - $(MAKE) -f Makefile tkzinc ptkzinc doc + $(MAKE) -f Makefile INSTALLMAN1DIR=$(TMP)/usr/man/man1 INSTALLMAN3DIR=$(TMP)/usr/man/man3 INSTALLPRIVLIB=$(TMP)/usr/lib/perl5 INSTALLARCHLIB=$(TMP)$(INSTALLARCHLIB) tkzinc ptkzinc doc touch build clean: @@ -37,11 +42,9 @@ binary-arch: checkroot build install -d debian/tmp cd debian/tmp && install -d `cat ../dirs` - $(SHELL) -c ". /root/.bashrc; $(MAKE) install prefix=`pwd`/debian/tmp/usr" - - -rm -f debian/tmp/usr/lib/perl5/i386-linux/5.004/perllocal.pod + $(MAKE) install prefix=`pwd`/debian/tmp/usr INSTALL_PERL=pure_install - install -m644 Perl/t/zinc.pl debian/tmp/usr/doc/zinc-perl/examples + install -m644 Perl/t/zinc.t debian/tmp/usr/doc/zinc-perl/examples install -m644 test/*.tcl test/*.pl debian/tmp/usr/doc/zinc-tk/examples install -m644 Python/Zinc.py debian/tmp/usr/lib/python1.5/site-packages/ @@ -11,6 +11,6 @@ #ifndef ZINCVERSION #define ZINCVER 3 #define ZINCREV 1 -#define ZINCPLVL 9 -#define ZINCVERSION "zinc-version-319" +#define ZINCPLVL 10 +#define ZINCVERSION "zinc-version-3110" #endif |