From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 11 Sep 2007 16:02:22 -0000 Subject: [Cluster-devel] conga ./Makefile luci/cluster/Makefile luci/si ... Message-ID: <20070911160222.29454.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2007-09-11 16:02:19 Modified files: . : Makefile luci/cluster : Makefile luci/site : Makefile luci/logs : Makefile luci/init.d : Makefile luci/conga_ssl : Makefile luci/docs : Makefile luci/homebase : Makefile luci : Makefile luci/storage : Makefile luci/plone-custom: Makefile luci/sysconfig : Makefile luci/utils : Makefile Log message: Cleanup luci makefiles Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/logs/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/docs/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/sysconfig/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2 --- conga/Makefile 2007/09/09 14:18:36 1.13 +++ conga/Makefile 2007/09/11 16:02:16 1.14 @@ -1,13 +1,12 @@ -################################################################################################################################################################ +################################################################################ ## -## Copyright (C) 2005 Red Hat, Inc. All rights reserved. +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. ## -## This copyrighted material is made available to anyone wishing to use, -## modify, copy, or redistribute it subject to the terms and conditions -## of the GNU General Public License v.2. +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. ## -############################################################################################################################################################## - +################################################################################ include make/version.in @@ -17,7 +16,6 @@ .PHONY: conga ricci luci clustermon - all: conga clustermon echo "Run 'make install' to install conga and clustermon" @@ -34,10 +32,9 @@ ${MAKE} -C ricci clustermon echo "Run 'make install_clustermon' to install modcluster, cluster-cim and cluster-snmp" - install: install_conga install_clustermon -install_conga: install_ricci install_luci +install_conga: install_ricci install_luci install_ricci: ${MAKE} -C ricci install_ricci @@ -45,10 +42,9 @@ install_luci: ${MAKE} -C luci install -install_clustermon: +install_clustermon: ${MAKE} -C ricci install_clustermon - clean: clean_ricci clean_luci clean_clustermon clean_ricci: @@ -60,19 +56,16 @@ clean_clustermon: ${MAKE} -C ricci clean_clustermon - -distclean: +distclean: ${MAKE} -C ricci distclean ${MAKE} -C luci distclean rm -f conga.spec conga.spec.in - rm -f conga*.tar.gz conga*.src.rpm + rm -f conga*.tar.gz conga*.src.rpm rm -f clustermon.spec clustermon.spec.in rm -f clustermon*.tar.gz clustermon*.src.rpm - rebuild: clean all - srpms: conga_srpm clustermon_srpm conga_srpm: clean @@ -121,4 +114,3 @@ else \ rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm ; \ fi - --- conga/luci/cluster/Makefile 2006/10/05 15:01:39 1.6 +++ conga/luci/cluster/Makefile 2007/09/11 16:02:18 1.7 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme --- conga/luci/site/Makefile 2007/08/20 16:31:12 1.15 +++ conga/luci/site/Makefile 2007/09/11 16:02:18 1.16 @@ -1,18 +1,23 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ include ../make/defines.mk - ifeq "${include_zope_and_plone}" "yes" -ZOPE_HOME=${libdir}/luci/zope + ZOPE_HOME=${libdir}/luci/zope else -ZOPE_HOME=${libdir}/zope + ZOPE_HOME=${libdir}/zope endif - all: build - - build: cat luci/bin/runzope.in \ | sed -e s,@@ZOPE_HOME@@,${ZOPE_HOME},g \ @@ -37,50 +42,41 @@ | sed -e s,@@PYTHON_BIN@@,${bindir}/python,g \ > luci/etc/stunnel.conf - install: - install -d ${DESTDIR}/var/lib/luci + ${INSTALL_DIR} ${DESTDIR}/var/lib/luci echo False > ${DESTDIR}/var/lib/luci/.default_password_has_been_reset - chmod 640 ${DESTDIR}/var/lib/luci/.default_password_has_been_reset + ${INSTALL_FILE} -m 640 ${DESTDIR}/var/lib/luci/.default_password_has_been_reset - install -d ${DESTDIR}/var/lib/luci/bin -# install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin - install luci/bin/runzope ${DESTDIR}/var/lib/luci/bin -# install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin - - install -d ${DESTDIR}/var/lib/luci/etc -# install `find luci/etc -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/etc - install -m 644 luci/etc/logrotate.conf ${DESTDIR}/var/lib/luci/etc - install -m 644 luci/etc/stunnel.conf ${DESTDIR}/var/lib/luci/etc - install -m 644 luci/etc/zope.conf ${DESTDIR}/var/lib/luci/etc - - install -d ${DESTDIR}/var/lib/luci/Extensions - install -m 644 `find luci/Extensions -maxdepth 1 -type f -name \*.py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions - install -d ${DESTDIR}/var/lib/luci/Extensions/ClusterModel - install -m 644 `find luci/Extensions/ClusterModel -maxdepth 1 -type f -name \*.py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions/ClusterModel - - install -d ${DESTDIR}/var/lib/luci/import -# install -m 644 `find luci/import -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/import - - install -d ${DESTDIR}/var/lib/luci/log -# install -m 644 `find luci/log -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/log - - install -d ${DESTDIR}/var/lib/luci/Products -# install -m 644 `find luci/Products -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products - install -d ${DESTDIR}/var/lib/luci/Products/ManagedSystem - install -m 644 `find luci/Products/ManagedSystem -maxdepth 1 -type f | grep .py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Products/ManagedSystem - install -d ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins - install -m 644 `find luci/Products/ManagedSystem/skins -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins - - install -d ${DESTDIR}/var/lib/luci/var - install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs - install -d ${DESTDIR}/var/lib/luci/var/pts -# install -m 644 `find luci/var/pts -maxdepth 1 -type f | grep .mo | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/var/pts - install -d ${DESTDIR}/var/lib/luci/var/certs - install -d ${DESTDIR}/var/lib/luci/var/certs/peers - install -m 644 luci/var/certs/cacert.config ${DESTDIR}/var/lib/luci/var/certs - install -d ${DESTDIR}/var/lib/luci/var/stunnel + ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/bin + ${INSTALL_BIN} luci/bin/runzope ${DESTDIR}/var/lib/luci/bin + ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/etc + ${INSTALL_FILE} -m 644 luci/etc/logrotate.conf ${DESTDIR}/var/lib/luci/etc + ${INSTALL_FILE} -m 644 luci/etc/stunnel.conf ${DESTDIR}/var/lib/luci/etc + ${INSTALL_FILE} -m 644 luci/etc/zope.conf ${DESTDIR}/var/lib/luci/etc + + ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Extensions + ${INSTALL_FILE} -m 644 `find luci/Extensions -maxdepth 1 -type f -name \*.py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions + ${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/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_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/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 + ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var/stunnel clean: rm -f luci/bin/runzope @@ -88,5 +84,4 @@ rm -f luci/etc/zope.conf rm -f luci/etc/stunnel.conf - distclean: clean --- conga/luci/logs/Makefile 2006/10/25 01:11:08 1.1 +++ conga/luci/logs/Makefile 2007/09/11 16:02:18 1.2 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme --- conga/luci/init.d/Makefile 2006/06/14 21:44:34 1.2 +++ conga/luci/init.d/Makefile 2007/09/11 16:02:18 1.3 @@ -1,15 +1,19 @@ - - +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ all: - install: - install -d ${DESTDIR}/etc/rc.d/init.d - install luci ${DESTDIR}/etc/rc.d/init.d - + ${INSTALL_DIR} ${DESTDIR}/etc/rc.d/init.d + ${INSTALL_BIN} luci ${DESTDIR}/etc/rc.d/init.d clean: - distclean: --- conga/luci/conga_ssl/Makefile 2007/04/26 15:59:37 1.2 +++ conga/luci/conga_ssl/Makefile 2007/09/11 16:02:18 1.3 @@ -1,8 +1,16 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ include ../../make/version.in include ../make/defines.mk - .PHONY: build build: @@ -15,9 +23,8 @@ distclean: clean install: - install -d ${libdir}/luci - install -d ${libdir}/luci/ssl - install -m 644 build/lib*/conga_ssl_lib.so ${libdir}/luci/ssl + ${INSTALL_DIR} ${libdir}/luci + ${INSTALL_DIR} ${libdir}/luci/ssl + ${INSTALL_FILE} build/lib*/conga_ssl_lib.so ${libdir}/luci/ssl rebuild: clean build - --- conga/luci/docs/Makefile 2006/10/10 17:51:05 1.2 +++ conga/luci/docs/Makefile 2007/09/11 16:02:18 1.3 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme @@ -9,16 +19,12 @@ docs: - install: - clean: - distclean: - # import page local page templates to the Luci server import: @if test "$(FILES)"; then \ --- conga/luci/homebase/Makefile 2006/10/05 15:01:39 1.6 +++ conga/luci/homebase/Makefile 2007/09/11 16:02:18 1.7 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme --- conga/luci/Makefile 2007/09/09 14:18:37 1.24 +++ conga/luci/Makefile 2007/09/11 16:02:19 1.25 @@ -1,19 +1,24 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + ZOPEINSTANCE=/var/lib/luci include ../make/version.in include make/defines.mk - - - -# list zope/plone files and/or directories to be removed +# list zope/plone files and/or directories to be removed # (paths relative to zope/plone installation directory) ZOPE_REMOVES="bin include skel zopeskel lib64/python/ZEO lib64/python/nt_svcutils lib64/python/reStructuredText lib/python/ZEO lib/python/nt_svcutils lib/python/reStructuredText lib64/python/Products/ZGadflyDA lib64/python/Products/ZopeTutorial lib64/python/Products/ZReST lib/python/Products/ZGadflyDA lib/python/Products/ZopeTutorial lib/python/Products/ZReST" PLONE_REMOVES="Five README.txt ATContentTypes ATReferenceBrowserWidget ExtendedPathIndex ExternalEditor kupu Marshall PasswordResetTool PloneLanguageTool PloneTestCase" - - all: luci luci: @@ -24,13 +29,11 @@ ${MAKE} -C sysconfig ${MAKE} -C docs - rebuild: clean all - install: if [ "${include_zope_and_plone}" = "yes" ] ; then \ - install -d ${libdir}/luci ; \ + ${INSTALL_DIR} ${libdir}/luci ; \ cd zope ; \ ./configure --prefix=${libdir}/luci/zope --with-python=/usr/bin/python ; \ ${MAKE} ; \ @@ -39,22 +42,24 @@ chmod 700 ${libdir}/luci/zope ; \ utils/remove_files ${libdir}/luci/zope ${ZOPE_REMOVES} ; \ fi + if [ "${include_zope_and_plone}" = "yes" ] ; then \ - install -d ${libdir}/luci/zope/lib/python/Products ; \ + ${INSTALL_DIR} ${libdir}/luci/zope/lib/python/Products ; \ utils/remove_files plone ${PLONE_REMOVES} ; \ cp -R plone/* ${libdir}/luci/zope/lib/python/Products/ ; \ fi - install -d -m 700 ${DESTDIR}/var/lib/luci + ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci + ${MAKE} -C site install ${MAKE} -C conga_ssl install ${MAKE} -C utils install ${MAKE} -C init.d install ${MAKE} -C sysconfig install ${MAKE} -C docs install - install -d ${DESTDIR}/usr/share/doc/luci-${VERSION}/ - install -m 644 COPYING ${DESTDIR}/usr/share/doc/luci-${VERSION}/ + ${INSTALL_DIR} ${DESTDIR}/usr/share/doc/luci-${VERSION}/ + ${INSTALL_FILE} COPYING ${DESTDIR}/usr/share/doc/luci-${VERSION}/ clean: ${MAKE} -C site clean --- conga/luci/storage/Makefile 2006/10/05 15:01:40 1.6 +++ conga/luci/storage/Makefile 2007/09/11 16:02:19 1.7 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme --- conga/luci/plone-custom/Makefile 2006/10/05 15:01:40 1.3 +++ conga/luci/plone-custom/Makefile 2007/09/11 16:02:19 1.4 @@ -1,3 +1,13 @@ +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ + LUCI_HOST=luci LUCI_USER=admin LUCI_PASS=changeme --- conga/luci/sysconfig/Makefile 2006/07/06 20:35:06 1.2 +++ conga/luci/sysconfig/Makefile 2007/09/11 16:02:19 1.3 @@ -1,17 +1,19 @@ - - +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ all: - install: - install -d ${DESTDIR}/etc/sysconfig - install -m 644 luci ${DESTDIR}/etc/sysconfig - + ${INSTALL_DIR} ${DESTDIR}/etc/sysconfig + ${INSTALL_FILE} luci ${DESTDIR}/etc/sysconfig clean: - distclean: - - --- conga/luci/utils/Makefile 2006/06/02 00:14:28 1.1 +++ conga/luci/utils/Makefile 2007/09/11 16:02:19 1.2 @@ -1,16 +1,20 @@ - - +################################################################################ +## +## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, +## modify, copy, or redistribute it subject to the terms and conditions +## of the GNU General Public License v.2. +## +################################################################################ all: - install: - install -d ${DESTDIR}/usr - install -d ${DESTDIR}/usr/sbin - install luci_admin ${DESTDIR}/usr/sbin + ${INSTALL_DIR} ${DESTDIR}/usr + ${INSTALL_DIR} ${DESTDIR}/usr/sbin + ${INSTALL_BIN} -m 755 luci_admin ${DESTDIR}/usr/sbin clean: - distclean: -