use debian/pve-installer.install to install product specific html files

diff --git a/Makefile b/Makefile
index 2de93820f09d654e63e9e793b911e6d66dec136f..034ce2f796aa138a0076b24115767d15becab842 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,6 @@ ${DEB}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} Makefile htm
 .phony: install
 install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
        make -C html-common install
-       make -C html install
        install -D -m 644 interfaces ${DESTDIR}/etc/network/interfaces
        mkdir -p ${DESTDIR}/var/lib/dhcp3/
        ln -s /tmp/resolv.conf.dhclient-new ${DESTDIR}/etc/resolv.conf
@@ -59,6 +58,5 @@ check: packages test.img
 .phony: clean
 clean:
        make -C html-common clean
-       make -C html clean
        rm -rf *~ *.deb target build packages packages.tmp test.img pve-final.pkglist *.buildinfo *.changes
        find . -name '*~' -exec rm {} ';'

diff --git a/debian/pve-installer.install b/debian/pve-installer.install
index 5e33e0b814838fe4ddc72b388a4a3a365a49b815..34f1ab1c7f4bd49a310b791a2241b7c0dabb0f79 100644 (file)
--- a/debian/pve-installer.install
+++ b/debian/pve-installer.install
@@ -1 +1,9 @@
-proxlogo.png /var/lib/pve-installer
+proxlogo.png /var/lib/pve-installer/html
+html/page1.htm /var/lib/pve-installer/html
+html/passwd.htm /var/lib/pve-installer/html
+html/extract1-license.htm /var/lib/pve-installer/html
+html/extract2-rulesystem.htm /var/lib/pve-installer/html
+html/extract3-spam.htm /var/lib/pve-installer/html
+html/extract4-virus.htm /var/lib/pve-installer/html
+html/fail.htm /var/lib/pve-installer/html
+html/success.htm /var/lib/pve-installer/html

diff --git a/html/Makefile b/html/Makefile
index 75e738d32cd2db04eef706791bce3d00a9d0b0cb..adf4646ec220e102d40a114d53b96080b30043f1 100644 (file)
--- a/html/Makefile
+++ b/html/Makefile
@@ -2,17 +2,6 @@ DESTDIR=
 
 all:
 
-.phony: install
-install:
-       install -D -m 644 page1.htm ${DESTDIR}/var/lib/pve-installer/html/page1.htm
-       install -D -m 644 passwd.htm ${DESTDIR}/var/lib/pve-installer/html/passwd.htm
-       install -D -m 644 extract1-license.htm ${DESTDIR}/var/lib/pve-installer/html/extract1-license.htm
-       install -D -m 644 extract2-rulesystem.htm ${DESTDIR}/var/lib/pve-installer/html/extract2-rulesystem.htm
-       install -D -m 644 extract3-spam.htm ${DESTDIR}/var/lib/pve-installer/html/extract3-spam.htm
-       install -D -m 644 extract4-virus.htm ${DESTDIR}/var/lib/pve-installer/html/extract4-virus.htm
-       install -D -m 644 fail.htm ${DESTDIR}/var/lib/pve-installer/html/fail.htm
-       install -D -m 644 success.htm ${DESTDIR}/var/lib/pve-installer/html/success.htm
-
 .phony: clean
 clean:
        rm -rf *~

diff --git a/html/extract1-license.htm b/html/extract1-license.htm
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/extract2-rulesystem.htm b/html/extract2-rulesystem.htm
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/extract3-spam.htm b/html/extract3-spam.htm
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/extract4-virus.htm b/html/extract4-virus.htm
old mode 100755 (executable)
new mode 100644 (file)