Can send additional parameters with the search command (connected to bug #2217)
[pazpar2-moved-to-github.git] / debian / rules
index 483ee3e..32fb674 100755 (executable)
@@ -77,19 +77,21 @@ binary-arch: build install
        dh_installchangelogs NEWS
        # pazpar2-doc package
        mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
-       # pazpar2-apache2 package
-       cp $(CURDIR)/etc/pazpar2.cfg.dist $(CURDIR)/debian/pazpar2.cfg
-       patch $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/cfg.patch
+       # pazpar2 package
+       cp $(CURDIR)/etc/pazpar2.cfg.dist $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg
+       patch $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg $(CURDIR)/debian/cfg.patch
        cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
        cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
        cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
-       cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/apache2/conf.d
+       # pazpar2-apache2 package
+       cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2
        # pazpar2-test1 package
        cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
        cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
        # pazpar2-jsdemo package
        cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
        cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+       cp www/jsdemo/*.gif $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
        dh_installchangelogs NEWS
        dh_installdocs
        dh_installexamples