diff options
-rw-r--r-- | Makefile.in | 23 | ||||
-rw-r--r-- | README | 6 | ||||
-rwxr-xr-x | debian/rules | 34 |
3 files changed, 35 insertions, 28 deletions
diff --git a/Makefile.in b/Makefile.in index 7ce6433..f71824c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -245,6 +245,8 @@ install: all perlinstall install-binaries: binaries install-lib-binaries install-bin-binaries +install-tcl: install-binaries install-libraries install-demos install-doc + #======================================================================== # This rule installs platform-independent files, such as header files. #======================================================================== @@ -534,25 +536,26 @@ uninstall-binaries: # Targets for perl/Tk #-------------------------------------- -perl: binaries +Perl/Makefile: + cd Perl; perl Makefile.PL; + +perl: Perl/Makefile binaries @if test "x$(PERL_TK_LIB)" != "x"; then \ - cd Perl; perl Makefile.PL; make; \ - cd demos; perl Makefile.PL; make; \ + cd Perl; make; \ fi -testperl: binaries +testperl: Perl/Makefile binaries @if test "x$(PERL_TK_LIB)" != "x"; then \ - cd Perl; perl Makefile.PL; make test; \ + cd Perl; make test; \ fi -demoperl: binaries - (cd Perl; perl Makefile.PL; make; \ - perl -Mblib demos/zinc-demos) +demoperl: Perl/Makefile binaries + cd Perl; perl -Mblib demos/zinc-demos -perlinstall: binaries +perlinstall: Perl/Makefile binaries @echo "ZINC_ENABLE_PTK --> $(ZINC_ENABLE_PTK) $(INSTALL_PROGRAM) $(PERL_TK_LIB) DESTDIR=$(DESTDIR)" @if test "x$(PERL_TK_LIB)" != "x"; then \ $(INSTALL_DATA) $($(PACKAGE)_LIB_FILE) $(prefix)/lib; \ - cd Perl; perl Makefile.PL; make; make install; \ + cd Perl; make install; \ fi @@ -129,7 +129,7 @@ BUILDING AND INSTALLATION For use with Tcl on Unix/Linux and Windows using mingw32: make - make install + make install-tcl It is recommended to do a make distclean before actual building if you have done a previous build, especially between Tcl and Perl variants. @@ -155,7 +155,9 @@ BUILDING AND INSTALLATION tell the current load path. - For use with Perl/Tk only on Unix/Linux: + For use with Perl/Tk only on Unix/Linux, the better would be to read + the README.PERL file, which describres the usual way of buildind, testing, + and installing TkZinc. You can also do the following: ## Remember: you must use the --enable-ptk=yes option in ./configure diff --git a/debian/rules b/debian/rules index 29fd767..bf962a4 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ TMP=`pwd`/debian/tmp TMP_PERL=`pwd`/debian/zinc-perl TMP_PYTHON=`pwd`/debian/zinc-python -INSTALL_PERL=pure_install INSTALLDIRS=perl PREFIX=$(TMP)/usr +INSTALL_PERL=pure_install INSTALLDIRS=perl PREFIX=$(TMP_PERL)/usr DEFAULT_VERSION_PYTHON=$(shell echo `dpkg -p python| grep -e "^Version:" |cut -d" " -f2|cut -d"." -f1-2` ) @@ -43,7 +43,7 @@ install: build # Configuring/compiling/installing for Tcl. ./configure --prefix=/usr --enable-gl==damage make binaries - make install prefix=$(TMP)/usr + make install-tcl prefix=$(TMP)/usr # # Making/installing the documentation make pdf html @@ -59,23 +59,25 @@ install: build make clean # # Configuring/compiling/installing for perl/Tk. - ./configure --prefix=/usr --enable-ptk --enable-gl==damage - make perl - make perlinstall prefix=$(TMP)/usr INSTALL_PERL=$(INSTALL_PERL) - - find $(TMP)/usr/lib/perl -type f -name .packlist | xargs rm -f - find $(TMP)/usr/lib/perl5 -type f -name .packlist | xargs rm -f - +# ./configure --prefix=/usr --enable-ptk --enable-gl==damage + ./configure --prefix=$(TMP_PERL) --enable-ptk --enable-gl==damage + make -mkdir -p $(TMP_PERL)/usr/lib - mv $(TMP)/usr/lib/perl $(TMP_PERL)/usr/lib - mv $(TMP)/usr/bin $(TMP_PERL)/usr - mv $(TMP)/usr/lib/libTkzinc*.so $(TMP_PERL)/usr/lib + make install prefix=$(TMP_PERL)/usr INSTALL_PERL=$(INSTALL_PERL) - dh_installman -pzinc-perl $(TMP)/usr/share/man/man3/*.3pm - dh_installman -pzinc-perl $(TMP)/usr/share/man/man1/*.1p + find $(TMP_PERL)/usr/lib/perl -type f -name .packlist | xargs rm -f + find $(TMP_PERL)/usr/lib/perl5 -type f -name .packlist | xargs rm -f - -rm -Rf $(TMP)/usr/share/perl - -rm -Rf $(TMP)/usr/share/man +# -mkdir -p $(TMP_PERL)/usr/lib +# mv $(TMP)/usr/lib/perl $(TMP_PERL)/usr/lib +# mv $(TMP)/usr/bin $(TMP_PERL)/usr +# mv $(TMP)/usr/lib/libTkzinc*.so $(TMP_PERL)/usr/lib +# +# dh_installman -pzinc-perl $(TMP)/usr/share/man/man3/*.3pm +# dh_installman -pzinc-perl $(TMP)/usr/share/man/man1/*.1p +# +# -rm -Rf $(TMP)/usr/share/perl +# -rm -Rf $(TMP)/usr/share/man # Build architecture-independent files here. |