[debian-edu-commits] debian-edu/ 12/14: Adjust Makefile to reflect the changes.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 72a757610f09f53f2eb1be7a56444cd9a0aac044
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Jan 7 00:02:24 2018 +0100

    Adjust Makefile to reflect the changes.
---
 Makefile | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 44762d1..16e1ec0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@ PROGS = \
 	ltsp-arch-debian-edu \
 	update-ini-file
 
-SPROGS = cfengine-debian-edu \
-	debian-edu-fsautoresize \
+SPROGS = debian-edu-fsautoresize \
 	debian-edu-ltsp \
 	debian-edu-pxeinstall \
 	debian-edu-restart-services \
@@ -19,7 +18,7 @@ INSTALL_DATA= install -D -p -m 644
 
 prefix     = /usr/local
 sysconfdir = /etc
-cfdir      = $(sysconfdir)/cfengine/debian-edu
+cf3dir     = $(sysconfdir)/cfengine3/debian-edu
 bindir     = $(prefix)/bin
 sbindir    = $(prefix)/sbin
 docdir     = $(prefix)/share/doc/$(PACKAGE)
@@ -36,43 +35,33 @@ vardir     = /var
 wwwdir     = /etc/debian-edu/www
 
 
-CFFILES = \
+CF3FILES = \
 	cf.adduser \
 	cf.apache2 \
-	cf.apt \
-	cf.cfengine \
-	cf.chromium \
 	cf.cups \
 	cf.dhcpserver \
 	cf.exim \
 	cf.imap \
 	cf.homes \
 	cf.firefox-esr \
+	cf.finalize \
 	cf.grub \
+	cf.chromium \
 	cf.inetd \
 	cf.krb5client \
 	cf.ldapserver \
 	cf.ldapclient \
 	cf.bind \
-	cf.ltsp \
 	cf.pxeinstall \
-	cf.fstab \
-	cf.nagios3 \
 	cf.ntp \
 	cf.pki \
 	cf.samba \
 	cf.squid \
 	cf.syslog \
-	cf.sysstat \
-	cf.testsetup \
 	cf.thunderbird \
 	cf.xrdp \
-	cfd.conf \
-	cfengine.conf
-
-CFBINFILES = \
-	cfd \
-	cfrunhosts.pl
+	edu.cf \
+	promises.cf
 
 # Files to install in /etc/
 SYSCONFFILES = \
@@ -94,9 +83,6 @@ SYSCONFFILES = \
 	default/munin-node \
 	default/ldap2zone \
 	chromium/policies/managed/chromium-networked-prefs \
-	cfengine/cfservd.conf \
-	cfengine/update.conf \
-	cfengine/inputs/cfagent.conf \
 	cups/cupsd-debian-edu.conf \
 	cups/cups-files-debian-edu.conf \
 	dhcp/dhclient-exit-hooks.d/autofs-reload \
@@ -322,11 +308,8 @@ install: install-testsuite
 	$(DESTDIR)$(docdir)/examples/smb-roaming-profiles-$$l.conf ; \
 	done
 
-	set -e ; for cf in $(CFFILES); do \
-		$(INSTALL_DATA) cf/$$cf $(DESTDIR)$(cfdir)/$$cf; \
-	done
-	set -e ; for cf in $(CFBINFILES); do \
-		$(INSTALL) cf/$$cf $(DESTDIR)$(cfdir)/$$cf; \
+	set -e ; for cf3 in $(CF3FILES); do \
+		$(INSTALL_DATA) cf3/$$cf3 $(DESTDIR)$(cf3dir)/$$cf3; \
 	done
 
 	set -e ; for file in $(SYSCONFFILES) ; do \
@@ -349,6 +332,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/create-debian-edu-certs \
 		share/debian-edu-config/tools/cups-queue-autoflush \
 		share/debian-edu-config/tools/cups-queue-autoreenable \
+		share/debian-edu-config/tools/setup-cfengine3 \
 		share/debian-edu-config/tools/debian-edu-bless \
 		share/debian-edu-config/tools/debian-edu-winbind \
 		share/debian-edu-config/tools/get-default-homepage \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git