new upstream, various fixes

[pkg-nagvis.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 362cf520a278091ed735aa47c098d03e9a80d90e..99acb3d853c5c73c4ea8636baf8d628b42d02c71 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,34 +32,41 @@ install: build
        dh_testroot
        dh_clean -k
        
-       mkdir -p $(DEST)/{etc,usr/share/nagvis/{debian/,htdocs/{nagvis/,wui/},{,wui/}includes}}
+       mkdir -p $(DEST)/etc/nagvis $(DEST)/usr/share/nagvis/debian/ $(DEST)/usr/share/nagvis/htdocs/nagvis/ \
+               $(DEST)/usr/share/nagvis/htdocs/wui/ $(DEST)/usr/share/nagvis/includes $(DEST)/usr/share/nagvis/wui/includes
        
-       cp -a nagvis/etc $(DEST)/etc/nagvis
-       mv $(DEST)/etc/nagvis/config.ini.php.dist \
+       cp -a etc/* $(DEST)/etc/nagvis
+       mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
                $(DEST)/usr/share/nagvis/debian/
        sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
            -e 's/^[; ]*\(\<dbport\) *=.*$$/\1=_DBC_DBPORT_/' \
            -e 's/^[; ]*\(\<dbname\) *=.*$$/\1=_DBC_DBNAME_/' \
            -e 's/^[; ]*\(\<dbuser\) *=.*$$/\1=_DBC_DBUSER_/' \
            -e 's/^[; ]*\(\<dbpass\) *=.*$$/\1=_DBC_DBPASS_/' \
-        < $(DEST)/usr/share/nagvis/debian/config.ini.php.dist \
-        > $(DEST)/usr/share/nagvis/debian/config.ini.php.dist.new && \
-        mv $(DEST)/usr/share/nagvis/debian/config.ini.php.dist.new \
-           $(DEST)/usr/share/nagvis/debian/config.ini.php.dist
+        < $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample \
+        > $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new && \
+        mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
+           $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
        
-       cp -a nagvis/images $(DEST)/usr/share/nagvis/htdocs/nagvis/
        cp -a nagvis/includes/classes $(DEST)/usr/share/nagvis/includes/
-       cp -a nagvis/includes/{css,js,languages} $(DEST)/usr/share/nagvis/htdocs/nagvis/
+       cp -a nagvis/includes/defines $(DEST)/usr/share/nagvis/includes/
+       
+       cp -a nagvis/images $(DEST)/usr/share/nagvis/htdocs/nagvis/
+       cp -a nagvis/includes/css $(DEST)/usr/share/nagvis/htdocs/nagvis/
+       cp -a nagvis/includes/js $(DEST)/usr/share/nagvis/htdocs/nagvis/
+       cp -a nagvis/includes/languages $(DEST)/usr/share/nagvis/htdocs/nagvis/
+       
        cp -a nagvis/*.php $(DEST)/usr/share/nagvis/htdocs/nagvis/
        
        cp -a wui/images $(DEST)/usr/share/nagvis/htdocs/wui/
        cp -a wui/includes/classes $(DEST)/usr/share/nagvis/wui/includes/
-       cp -a wui/includes/{css,js} $(DEST)/usr/share/nagvis/htdocs/wui/
+       cp -a wui/includes/css $(DEST)/usr/share/nagvis/htdocs/wui/
+       cp -a wui/includes/js $(DEST)/usr/share/nagvis/htdocs/wui/
        cp -a wui/*.php $(DEST)/usr/share/nagvis/htdocs/wui/
        cp -a *.php $(DEST)/usr/share/nagvis/htdocs/
        
        # demo site
-       mkdir -p $(DEST)/demo/{nagvis/images/,etc/nagvis/}maps
+       mkdir -p $(DEST)/demo/nagvis/images/maps $(DEST)/demo/etc/nagvis/maps
        mv $(DEST)/etc/nagvis/maps/demo*.cfg $(DEST)/demo/etc/nagvis/maps/
        mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps/nagvis-demo.png \
                $(DEST)/demo/nagvis/images/maps/