[Cluster-devel] conga/ricci init.d/Makefile make/defines.mk.in ...
kupcevic at sourceware.org
kupcevic at sourceware.org
Fri Jun 30 22:26:16 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-06-30 22:26:13
Modified files:
ricci/init.d : Makefile
ricci/make : defines.mk.in
ricci/modules/cluster: Makefile
ricci/modules/cluster/clumon: Makefile
ricci/modules/cluster/clumon/init.d: Makefile
ricci/modules/cluster/clumon/src/cim-provider: Makefile
ricci/modules/cluster/clumon/src/daemon: Makefile
ricci/modules/cluster/clumon/src/snmp-agent: Makefile
ricci/modules/log: Makefile
ricci/modules/rpm: Makefile
ricci/modules/service: Makefile
ricci/modules/storage: Makefile
ricci/pam.d : Makefile
ricci/ricci : Makefile
Log message:
ricci towards FC compliant specfile: install non-exec files without exec bit set
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/pam.d/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- conga/ricci/init.d/Makefile 2006/06/14 21:44:34 1.2
+++ conga/ricci/init.d/Makefile 2006/06/30 22:26:12 1.3
@@ -18,8 +18,8 @@
all:
install:
- install -d ${sysconfdir}/rc.d/init.d
- install ${TARGET} ${sysconfdir}/rc.d/init.d
+ $(INSTALL_DIR) ${sysconfdir}/rc.d/init.d
+ $(INSTALL_BIN) ${TARGET} ${sysconfdir}/rc.d/init.d
uninstall:
--- conga/ricci/make/defines.mk.in 2006/06/16 20:44:15 1.3
+++ conga/ricci/make/defines.mk.in 2006/06/30 22:26:12 1.4
@@ -23,6 +23,13 @@
#--host=i686-redhat-linux-gnu
#--target=i386-redhat-linux-gnu
+
+INSTALL_DIR = install -d
+INSTALL_FILE = install -m 644
+INSTALL_BIN = install
+INSTALL_LIB = install
+
+
PEGASUS_PLATFORM ?= @@PEGASUS_PLATFORM@@
INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags`
--- conga/ricci/modules/cluster/Makefile 2006/06/16 20:44:15 1.10
+++ conga/ricci/modules/cluster/Makefile 2006/06/30 22:26:12 1.11
@@ -36,13 +36,13 @@
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
- install ricci-modcluster ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci-modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci-modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ricci-modcluster ${sbindir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci-modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci-modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
make -C clumon install
uninstall:
--- conga/ricci/modules/cluster/clumon/Makefile 2006/06/14 21:44:36 1.2
+++ conga/ricci/modules/cluster/clumon/Makefile 2006/06/30 22:26:12 1.3
@@ -27,21 +27,21 @@
cd init.d && ${MAKE} install
cd man && ${MAKE} install
# snmp
- install -d ${datadir}/snmp/mibs
- install REDHAT-MIB ${datadir}/snmp/mibs/
- install REDHAT-CLUSTER-MIB ${datadir}/snmp/mibs/
- install -d ${docdir}/cluster-snmp-${VERSION}
- install README ${docdir}/cluster-snmp-${VERSION}/
- install README.snmpd ${docdir}/cluster-snmp-${VERSION}/
- install COPYING ${docdir}/cluster-snmp-${VERSION}/
- install REDHAT-MIB ${docdir}/cluster-snmp-${VERSION}/
- install REDHAT-CLUSTER-MIB ${docdir}/cluster-snmp-${VERSION}/
+ $(INSTALL_DIR) ${datadir}/snmp/mibs
+ $(INSTALL_FILE) REDHAT-MIB ${datadir}/snmp/mibs/
+ $(INSTALL_FILE) REDHAT-CLUSTER-MIB ${datadir}/snmp/mibs/
+ $(INSTALL_DIR) ${docdir}/cluster-snmp-${VERSION}
+ $(INSTALL_FILE) README ${docdir}/cluster-snmp-${VERSION}/
+ $(INSTALL_FILE) README.snmpd ${docdir}/cluster-snmp-${VERSION}/
+ $(INSTALL_FILE) COPYING ${docdir}/cluster-snmp-${VERSION}/
+ $(INSTALL_FILE) REDHAT-MIB ${docdir}/cluster-snmp-${VERSION}/
+ $(INSTALL_FILE) REDHAT-CLUSTER-MIB ${docdir}/cluster-snmp-${VERSION}/
# cim
- install -d ${docdir}/cluster-cim-${VERSION}
- install README ${docdir}/cluster-cim-${VERSION}/
- install README.cim ${docdir}/cluster-cim-${VERSION}/
- install RedHat_ClusterProvider.mof ${docdir}/cluster-cim-${VERSION}/
- install RedHat_ClusterSchema.mof ${docdir}/cluster-cim-${VERSION}/
+ $(INSTALL_DIR) ${docdir}/cluster-cim-${VERSION}
+ $(INSTALL_FILE) README ${docdir}/cluster-cim-${VERSION}/
+ $(INSTALL_FILE) README.cim ${docdir}/cluster-cim-${VERSION}/
+ $(INSTALL_FILE) RedHat_ClusterProvider.mof ${docdir}/cluster-cim-${VERSION}/
+ $(INSTALL_FILE) RedHat_ClusterSchema.mof ${docdir}/cluster-cim-${VERSION}/
uninstall:
--- conga/ricci/modules/cluster/clumon/init.d/Makefile 2006/06/14 21:44:36 1.3
+++ conga/ricci/modules/cluster/clumon/init.d/Makefile 2006/06/30 22:26:12 1.4
@@ -19,8 +19,8 @@
clean:
install:
- install -d ${sysconfdir}/rc.d/init.d
- install ${TARGET} ${sysconfdir}/rc.d/init.d
+ $(INSTALL_DIR) ${sysconfdir}/rc.d/init.d
+ $(INSTALL_BIN) ${TARGET} ${sysconfdir}/rc.d/init.d
uninstall:
${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2006/06/16 20:44:16 1.3
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2006/06/30 22:26:12 1.4
@@ -67,8 +67,8 @@
all: ${TARGET}
install:
- install -d ${pegasus_providers_dir}
- install ${TARGET} ${pegasus_providers_dir}
+ $(INSTALL_DIR) ${pegasus_providers_dir}
+ $(INSTALL_LIB) ${TARGET} ${pegasus_providers_dir}
uninstall:
${UNINSTALL} ${TARGET} ${pegasus_providers_dir}
--- conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2006/06/16 20:44:16 1.3
+++ conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2006/06/30 22:26:13 1.4
@@ -27,8 +27,8 @@
all: ${TARGET}
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2006/06/16 20:44:16 1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2006/06/30 22:26:13 1.3
@@ -39,8 +39,8 @@
install:
- install -d ${libdir}/cluster-snmp
- install ${TARGET} ${libdir}/cluster-snmp
+ $(INSTALL_DIR) ${libdir}/cluster-snmp
+ $(INSTALL_LIB) ${TARGET} ${libdir}/cluster-snmp
uninstall:
${UNINSTALL} ${TARGET} ${libdir}/cluster-snmp
--- conga/ricci/modules/log/Makefile 2006/06/16 20:44:16 1.3
+++ conga/ricci/modules/log/Makefile 2006/06/30 22:26:13 1.4
@@ -31,13 +31,13 @@
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
- install ricci-modlog ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci-modlog.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ricci-modlog ${sbindir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci-modlog.systembus.conf ${sysconfdir}/dbus-1/system.d
uninstall:
--- conga/ricci/modules/rpm/Makefile 2006/06/16 20:44:17 1.4
+++ conga/ricci/modules/rpm/Makefile 2006/06/30 22:26:13 1.5
@@ -32,13 +32,13 @@
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
- install ricci-modrpm ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci-modrpm.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ricci-modrpm ${sbindir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci-modrpm.systembus.conf ${sysconfdir}/dbus-1/system.d
uninstall:
--- conga/ricci/modules/service/Makefile 2006/06/16 20:44:17 1.5
+++ conga/ricci/modules/service/Makefile 2006/06/30 22:26:13 1.6
@@ -31,13 +31,13 @@
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
- install ricci-modservice ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci-modservice.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ricci-modservice ${sbindir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci-modservice.systembus.conf ${sysconfdir}/dbus-1/system.d
uninstall:
--- conga/ricci/modules/storage/Makefile 2006/06/16 20:44:17 1.7
+++ conga/ricci/modules/storage/Makefile 2006/06/30 22:26:13 1.8
@@ -60,13 +60,13 @@
install:
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
- install ricci-modstorage ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci-modstorage.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ricci-modstorage ${sbindir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci-modstorage.systembus.conf ${sysconfdir}/dbus-1/system.d
uninstall:
--- conga/ricci/pam.d/Makefile 2006/06/14 21:44:37 1.2
+++ conga/ricci/pam.d/Makefile 2006/06/30 22:26:13 1.3
@@ -16,8 +16,8 @@
all:
install:
- install -d ${sysconfdir}/pam.d
- install ricci ${sysconfdir}/pam.d/
+ $(INSTALL_DIR) ${sysconfdir}/pam.d
+ $(INSTALL_FILE) ricci ${sysconfdir}/pam.d/
uninstall:
--- conga/ricci/ricci/Makefile 2006/06/16 20:44:17 1.11
+++ conga/ricci/ricci/Makefile 2006/06/30 22:26:13 1.12
@@ -49,19 +49,19 @@
*.o: *.h ../include/*.h
install:
- install -d ${sbindir}
- install -d ${localstatedir}/lib/ricci
- install -d ${localstatedir}/lib/ricci/certs
- install -d ${localstatedir}/lib/ricci/certs/clients
- install -d ${localstatedir}/lib/ricci/queue
- install cacert.config ${localstatedir}/lib/ricci/certs/
- install ${TARGET} ${sbindir}
- install ${TARGET_AUTH} ${sbindir}
- install ${TARGET_WORKER} ${sbindir}
- install -d ${sysconfdir}/oddjobd.conf.d
- install -d ${sysconfdir}/dbus-1/system.d
- install d-bus/ricci.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- install d-bus/ricci.systembus.conf ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sbindir}
+ $(INSTALL_BIN) ${TARGET} ${sbindir}
+ $(INSTALL_BIN) ${TARGET_AUTH} ${sbindir}
+ $(INSTALL_BIN) ${TARGET_WORKER} ${sbindir}
+ $(INSTALL_DIR) ${localstatedir}/lib/ricci
+ $(INSTALL_DIR) ${localstatedir}/lib/ricci/queue
+ $(INSTALL_DIR) ${localstatedir}/lib/ricci/certs
+ $(INSTALL_FILE) cacert.config ${localstatedir}/lib/ricci/certs/
+ $(INSTALL_DIR) ${localstatedir}/lib/ricci/certs/clients
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_FILE) d-bus/ricci.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_FILE) d-bus/ricci.systembus.conf ${sysconfdir}/dbus-1/system.d
uninstall:
More information about the Cluster-devel
mailing list