Submitted By: Mario Fetka (mario dot fetka at gmail dot com) Date: 2011-01-21 Initial Package Version: 3.0.1 Origin: me Upstream Status: unknown Description: split install target diff -Naur mmc-core-3.0.1.orig/agent/Makefile mmc-core-3.0.1/agent/Makefile --- mmc-core-3.0.1.orig/agent/Makefile 2011-01-21 15:34:54.000000000 +0000 +++ mmc-core-3.0.1/agent/Makefile 2011-01-21 15:50:08.000000000 +0000 @@ -56,37 +56,55 @@ @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 $(OWNER) -g $(OGROUP) $(DESTDIR)$(SBINDIR) - $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(BINDIR) - $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(LIBDIR) - $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(LIBDIRBACKUP) - $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(ETCDIR) - $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(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 $(OWNER) -g $(OGROUP) $(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 $(OWNER) -g $(OGROUP) $(DESTDIR)$(LIBDIRBACKUP) @echo "" @echo "Install LIBDIRBACKUP in $(DESTDIR)$(LIBDIRBACKUP)" $(INSTALL) -m 755 -o $(OWNER) -g $(OGROUP) $(LIBFILESBACKUP) $(DESTDIR)$(LIBDIRBACKUP) +install_sbin: + @echo "" + @echo "Creating sbin directories..." + $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(SBINDIR) @echo "" @echo "Install SBINFILES in $(DESTDIR)$(SBINDIR)" $(INSTALL) -m 755 -o $(OWNER) -g $(OGROUP) $(SBINFILES) $(DESTDIR)$(SBINDIR) +install_bin: + @echo "" + @echo "Creating bin directories..." + $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(BINDIR) @echo "" @echo "Install BINFILES in $(DESTDIR)$(BINDIR)" $(INSTALL) -m 755 -o $(OWNER) -g $(OGROUP) $(BINFILES) $(DESTDIR)$(BINDIR) +install_cfg: + @echo "" + @echo "Creating config directories..." + $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(ETCDIR) @echo "" @echo "Install CONFILES in $(DESTDIR)$(ETCDIR)" $(INSTALL) -d -m 755 -o $(OWNER) -g $(OGROUP) $(DESTDIR)$(ETCDIR)/agent @@ -99,7 +117,7 @@ $(INSTALL) -m 755 -o $(OWNER) -g $(OGROUP) init.d/mmc-agent $(DESTDIR)$(INITDIR) 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