CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-09-11 17:27:46
Modified files:
luci/init.d : Makefile
luci/site : Makefile
luci/sysconfig : Makefile
luci/utils : Makefile
Log message:
More makefile tweaks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/sysconfig/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- conga/luci/init.d/Makefile 2007/09/11 16:02:18 1.3
+++ conga/luci/init.d/Makefile 2007/09/11 17:27:46 1.4
@@ -8,6 +8,8 @@
##
################################################################################
+include ../make/defines.mk
+
all:
install:
--- conga/luci/site/Makefile 2007/09/11 16:02:18 1.16
+++ conga/luci/site/Makefile 2007/09/11 17:27:46 1.17
@@ -45,7 +45,7 @@
install:
${INSTALL_DIR} ${DESTDIR}/var/lib/luci
echo False > ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
- ${INSTALL_FILE} -m 640
${DESTDIR}/var/lib/luci/.default_password_has_been_reset
+ chmod 640 ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/bin
${INSTALL_BIN} luci/bin/runzope ${DESTDIR}/var/lib/luci/bin
@@ -60,19 +60,18 @@
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Extensions/ClusterModel
${INSTALL_FILE} -m 644 `find luci/Extensions/ClusterModel -maxdepth 1
-type f -name \*.py | grep -v \~ | grep -v \#`
${DESTDIR}/var/lib/luci/Extensions/ClusterModel
- ${INSTALL_DIR} ${DESTDIR}/var/lib/luci/import
-
+ ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/import
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/log
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Products
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Products/ManagedSystem
${INSTALL_FILE} -m 644 `find luci/Products/ManagedSystem -maxdepth 1
-type f | grep .py | grep -v \~ | grep -v \#`
${DESTDIR}/var/lib/luci/Products/ManagedSystem
- ${INSTALL_DIR} ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins
+ ${INSTALL_DIR} -m 700
${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins
${INSTALL_FILE} -m 644 `find luci/Products/ManagedSystem/skins
-maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var
${INSTALL_FILE} -m 600 luci/var/Data.fs
${DESTDIR}/var/lib/luci/var/Data.fs
- ${INSTALL_DIR} ${DESTDIR}/var/lib/luci/var/pts
+ ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var/pts
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var/certs
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var/certs/peers
${INSTALL_FILE} -m 644 luci/var/certs/cacert.config
${DESTDIR}/var/lib/luci/var/certs
--- conga/luci/sysconfig/Makefile 2007/09/11 16:02:19 1.3
+++ conga/luci/sysconfig/Makefile 2007/09/11 17:27:46 1.4
@@ -8,6 +8,8 @@
##
################################################################################
+include ../make/defines.mk
+
all:
install:
--- conga/luci/utils/Makefile 2007/09/11 16:02:19 1.2
+++ conga/luci/utils/Makefile 2007/09/11 17:27:46 1.3
@@ -8,6 +8,8 @@
##
################################################################################
+include ../make/defines.mk
+
all:
install:
