Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) Date: 2010-05-01 Initial Package Version: 3.0.0 Origin: me Upstream Status: unknown Description: split install target diff -Naur mmc-core-3.0.0.orig/agent/Makefile mmc-core-3.0.0/agent/Makefile --- mmc-core-3.0.0.orig/agent/Makefile 2010-04-29 12:01:45.000000000 +0000 +++ mmc-core-3.0.0/agent/Makefile 2010-05-01 10:04:57.802871100 +0000 @@ -52,37 +52,56 @@ @echo "Nothing to do" # Install everything -install: +install: install_py install_lib_backup install_sbin install_bin install_cfg @# Install directories @echo "" @echo "Move old configuration files to $(DESTDIR)$(ETCDIR)$(BACKUP)" -[ -d $(DESTDIR)$(ETCDIR) ] && mv -f $(DESTDIR)$(ETCDIR) $(DESTDIR)$(ETCDIR)$(BACKUP) + +install_nopy: install_lib_backup install_sbin install_bin install_cfg + @# Install directories @echo "" - @echo "Creating directories..." - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(BINDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX) + # @echo "Move old configuration files to $(DESTDIR)$(ETCDIR)$(BACKUP)" + # -[ -d $(DESTDIR)$(ETCDIR) ] && mv -f $(DESTDIR)$(ETCDIR) $(DESTDIR)$(ETCDIR)$(BACKUP) + +install_py: + @echo "" + @echo "Creating python directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX) @echo "" @echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)" $(PYTHON) setup.py install --no-compile --prefix $(DESTDIR)$(PYTHON_PREFIX) +install_lib_backup: + @echo "" + @echo "Creating lib backup directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP) @echo "" @echo "Install LIBDIRBACKUP in $(DESTDIR)$(LIBDIRBACKUP)" $(INSTALL) $(LIBFILESBACKUP) -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP) +install_sbin: + @echo "" + @echo "Creating sbin directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR) @echo "" @echo "Install SBINFILES in $(DESTDIR)$(SBINDIR)" $(INSTALL) $(SBINFILES) -m 755 -o root -g root $(DESTDIR)$(SBINDIR) +install_bin: + @echo "" + @echo "Creating bin directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(BINDIR) @echo "" @echo "Install BINFILES in $(DESTDIR)$(BINDIR)" $(INSTALL) $(BINFILES) -m 755 -o root -g root $(DESTDIR)$(BINDIR) +install_cfg: + @echo "" + @echo "Creating config directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR) @echo "" @echo "Install CONFILES in $(DESTDIR)$(ETCDIR)" $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/agent @@ -97,7 +116,7 @@ $(SED) -i 's!##SBINDIR##!$(SBINDIR)!' $(DESTDIR)$(INITDIR)/mmc-agent ifndef NOCHECKPASSWORD - $(MAKE) -C openldap-check-password install CC=$(CC) INSTALL=$(INSTALL) + $(MAKE) -C openldap-check-password install CC=$(CC) INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) endif include common.mk