X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=debian%2Frules;h=c1c24d503e1592a7bfeabfb6eea819a3d0dab652;hp=650080fa9c20ab211eb1116b6cabb719e1498005;hb=2c622539de3e2a0a5e6ca42f20c7f0379901b12d;hpb=e6280ccfa52d2ffc28b3e879377b934faff2b350 diff --git a/debian/rules b/debian/rules index 650080f..c1c24d5 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,7 @@ # This is the debhelper compatability version to use. export DH_COMPAT=2 -YAZ_WITH_SSL?=1 -CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr +CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr --with-openssl # Enable parallel builds if CONCURRENCY_LEVEL is set ifdef CONCURRENCY_LEVEL @@ -21,17 +20,10 @@ else MCFLAGS= endif -ifeq ($(YAZ_WITH_SSL),1) -export BUILD_SSL=1 -SSL_FLAGS=--with-openssl -else -SSL_FLAGS= -endif - YAZSRCDIR?=$(shell pwd) # Local library path for linking with right dependencies -LOCAL_LINK=-ldebian/yaz-runtime/usr/lib:debian/yaz-ssl/usr/lib +LOCAL_LINK=-ldebian/libyaz/usr/lib $(YAZSRCDIR)/configure: $(YAZSRCDIR)/configure.in cd $(YAZSRCDIR); sh buildconf.sh @@ -41,7 +33,7 @@ stamp-configure: $(YAZSRCDIR)/configure -rm -rf build mkdir build - cd build; $(YAZSRCDIR)/configure $(CONFIG_FLAGS) $(SSL_FLAGS) + cd build; $(YAZSRCDIR)/configure $(CONFIG_FLAGS) touch stamp-configure build: stamp-build @@ -60,8 +52,8 @@ clean: -rm -rf build dh_clean - -rm -rf debian/yaz-runtime debian/yaz-ssl debian/yaz-devel \ - debian/with-ssl debian/*.debhelper debian/substvars debian/shlibs.yaz-* + -rm -rf debian/libyaz debian/libyaz-dev \ + debian/*.debhelper debian/substvars debian/shlibs.yaz-* install: stamp-install stamp-install: stamp-build @@ -80,7 +72,7 @@ stamp-install: stamp-build binary-indep: build install dh_testdir dh_testroot - dh_installdocs -p yaz-doc doc/*.html doc/*.pdf doc/*.png + dh_installdocs -p yaz-doc doc/*.html doc/*.pdf doc/*.png doc/*.css dh_installchangelogs -p yaz-doc dh_link -p yaz-doc dh_strip -p yaz-doc @@ -95,12 +87,10 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot -ifeq ($(YAZ_WITH_SSL),1) - dh_movefiles -p yaz-ssl usr/bin/*ssl usr/lib/libyazssl* -endif - dh_movefiles -p yaz-devel usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include usr/bin/yaz-config usr/bin/yaz-comp - dh_movefiles -p yaz-runtime usr/lib usr/share/yaz usr/bin - dh_installexamples -p yaz-devel + dh_movefiles -p libyaz-dev usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include usr/bin/yaz-config usr/bin/yaz-asncomp usr/share/yaz/ill usr/share/yaz/z39.50 + dh_movefiles -p yaz usr/bin + dh_movefiles -p libyaz usr/lib usr/share/yaz/etc + dh_installexamples -p libyaz-dev cp LICENSE debian/copyright cp CHANGELOG changelog @@ -108,60 +98,53 @@ endif dh_installchangelogs dh_link + + dh_installdeb -p libyaz + dh_installdeb -p libyaz-dev + dh_installdeb -p yaz + + dh_installman -p libyaz-dev doc/yaz-config.8 + dh_installman -p libyaz-dev doc/yaz-asncomp.1 + dh_installman -p libyaz doc/yaz.7 + dh_installman -p yaz doc/yaz-client.1 doc/yaz-ztest.8 doc/zoomsh.1 + dh_installman -p yaz doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8 + dh_installman -p yaz doc/yaz-marcdump.1 + dh_installman -p yaz doc/yaz-iconv.1 + dh_strip dh_compress -a dh_fixperms -a - dh_installdeb -p yaz-runtime - dh_installdeb -p yaz-devel - dh_installman -p yaz-devel doc/yaz-config.1 - dh_undocumented -p yaz-devel yaz-comp.1 - dh_installman -p yaz-runtime doc/yaz-client.1 doc/yaz-ztest.8 doc/yaz.7 doc/zoomsh.1 - echo "libyaz 2 yaz-runtime (>= 1.9.3)" > debian/yaz-runtime/DEBIAN/shlibs - echo "libyazthread 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs - echo "libyazmalloc 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs - chmod 644 debian/yaz-runtime/DEBIAN/shlibs - dh_shlibdeps -p yaz-runtime $(LOCAL_LINK) -ifeq ($(YAZ_WITH_SSL),1) - dh_installdeb -p yaz-ssl - dh_installman -p yaz-ssl doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8 - echo "libyazssl 2 yaz-ssl (>= 1.9.3)" >> debian/yaz-ssl/DEBIAN/shlibs - chmod 644 debian/yaz-ssl/DEBIAN/shlibs - dh_shlibdeps -p yaz-ssl $(LOCAL_LINK) - cat debian/postinst >> debian/yaz-ssl/DEBIAN/postinst -endif - cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst + echo "libyaz 2 libyaz (>= 2.0.2)" > debian/libyaz/DEBIAN/shlibs + echo "libyazthread 2 libyaz (>= 2.0.2)" >> debian/libyaz/DEBIAN/shlibs + echo "libyazssl 2 libyaz (>= 2.0.2)" >> debian/libyaz/DEBIAN/shlibs + chmod 644 debian/libyaz/DEBIAN/shlibs + dh_shlibdeps -p libyaz $(LOCAL_LINK) - dh_gencontrol -p yaz-runtime - dh_md5sums -p yaz-runtime + dh_gencontrol -p libyaz + dh_md5sums -p libyaz - dh_gencontrol -p yaz-devel - dh_md5sums -p yaz-devel + dh_gencontrol -p libyaz-dev + dh_md5sums -p libyaz-dev + + dh_gencontrol -p yaz + dh_md5sums -p yaz -ifeq ($(YAZ_WITH_SSL),1) - dh_gencontrol -p yaz-ssl - dh_md5sums -p yaz-ssl -endif # Go kill those CVS-dirs before build -find debian/tmp -type d -name CVS | xargs rm -rf # For some reason it is necessary to remove empty-dirs in yaz-doc -rm -rf debian/tmp/usr/include debian/tmp/usr/share/aclocal debian/tmp/usr/lib debian/tmp/usr/bin \ debian/tmp/usr/share/yaz - dh_builddeb -p yaz-runtime - dh_builddeb -p yaz-devel -ifeq ($(YAZ_WITH_SSL),1) - dh_builddeb -p yaz-ssl -endif + dh_builddeb -p libyaz + dh_builddeb -p libyaz-dev + dh_builddeb -p yaz binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install install-stamp configure yazrelease: - # Conveniency target for building both SSL and non-ssl versions + # Conveniency target for building YAZ dh_testdir - # Non-ssl version and source dpkg-buildpackage $(EXTRA_OPTS) -rfakeroot - # SSL version - -YAZ_WITH_SSL=1 dpkg-buildpackage $(EXTRA_OPTS) -rfakeroot -B