summaryrefslogtreecommitdiffstats
path: root/shells/jailkit/files/patch-Makefile.in
blob: f6f2c7a45fef4a164f2ed3b6baac719348153a10 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
--- Makefile.in.orig	2009-08-20 20:46:11.000000000 -0300
+++ Makefile.in	2009-08-20 20:46:51.000000000 -0300
@@ -38,22 +38,22 @@
 jailkit: all
 
 all:
-	@cd src/ && $(MAKE) all
-	@cd py/ && $(MAKE) all
-	@cd man/ && $(MAKE) all
+	$(MAKE) -C src all
+	$(MAKE) -C py all
+	$(MAKE) -C man all
 
 clean:
 	rm -f core *~ ini/*~
-	@cd src/ && $(MAKE) clean
-	@cd py/ && $(MAKE) clean
-	@cd man/ && $(MAKE) clean
+	$(MAKE) -C src clean
+	$(MAKE) -C py clean
+	$(MAKE) -C man clean
 
 distclean: clean
 	rm -rf autom4te.cache/
 	rm -f Makefile config.log config.status config.cache
-	@cd src/ && $(MAKE) distclean
-	@cd py/ && $(MAKE) distclean
-	@cd man/ && $(MAKE) distclean
+	$(MAKE) -C src distclean
+	$(MAKE) -C py distclean
+	$(MAKE) -C man distclean
 
 install:
 	${INSTALL} -d -m 755 ${DESTDIR}${iniprefix}
@@ -64,24 +64,13 @@
 			${INSTALL} -m 0644 ini/$${file} ${DESTDIR}${iniprefix} ;\
 		fi ;\
 	done
-	@cd src/ && $(MAKE) install
-	@cd py/ && $(MAKE) install
-	@cd man/ && $(MAKE) install
-	# test if the jk_chrootsh is already in /etc/shells
-	# this previously had @echo but that fails on FreeBSD
-	if test -w /etc/shells; then \
-		if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \
-			echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\
-			echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\
-		fi \
-	fi
-
+	$(MAKE) -C src install
+	$(MAKE) -C py install
+	$(MAKE) -C man install
 
 uninstall:
 	rm -f ${iniprefix}/*.ini
-	@cd py/ && $(MAKE) uninstall
-	@cd man/ && $(MAKE) uninstall
-	@cd src/ && $(MAKE) uninstall
+	$(MAKE) -C py uninstall
+	$(MAKE) -C man uninstall
+	$(MAKE) -C src uninstall
 	-rmdir --ignore-fail-on-non-empty ${DESTDIR}${iniprefix}
-	@echo "You must manually remove jk_chrootsh from /etc/shells"
-# remove jk_chrootsh from /etc/shells
OpenPOWER on IntegriCloud