Changeset 299

Timestamp:

01/24/2009 15:16:19 (3 years ago)

Author:

ccowart

Message:

Makefile cleanup.

• Renaming executables to drop .sh suffix.
• Updating directory handling in Makefile
• Getting man pages into Makefile

See #8

Location:

trunk

Files:

• Makefile (modified) (4 diffs)
• confaudit (moved) (moved from trunk/confaudit.sh)
• confexport (moved) (moved from trunk/export.sh)
• conflock (moved) (moved from trunk/conflock.sh) (1 prop)
• confsync (moved) (moved from trunk/confsync.sh)

trunk/Makefile

@@ -1 @@
-PREFIX ?= /usr/local
+PREFIX                  ?=      /usr/local
+MANPREFIX               ?=      ${PREFIX}/man
 
-DIRFLAGS                =       -d -o root -g wheel -m 0555
 EXFLAGS                 =       -Sp -o root -g wheel -m 0555
 INFLAGS                 =       -Sp -o root -g wheel -m 0444
 
 BINFILES                =       abspath
-SBINFILES               =       confman confaudit.sh
-LIBEXECFILES    =       export.sh confsync.sh confaudit.sh conflock.sh
+SBINFILES               =       confman
+LIBEXECFILES    =       confexport confsync confaudit conflock
 LIBFILES                =       confmanlib.sh confmandoc.sh confmancommon.sh
 ENVFILES                =       confman_completions
 CONFFILES               =       confman.conf defaults.conf
+MAN5                    =       confman.conf.5
+MAN8                    =       confman.8 confaudit.8 confexport.8 confsync.8
+MANFILES                =       $(MAN5) $(MAN8)
 DIRECTORIES             =       /etc /etc/defaults /etc/env.d /sbin /bin /libexec \
                                                 /libexec/confman /share /share/confman
 
 ALLFILES                =       $(BINFILES) $(SBINFILES) $(LIBEXECFILES) $(LIBFILES) \
-                                        $(ENVFILES) $(CONFFILES)
+                                        $(ENVFILES) $(CONFFILES) $(MANFILES)
 
 all : .config
@@ -25 +28 @@
 install : .config
 .for dir in $(DIRECTORIES)
-        install $(DIRFLAGS) $(PREFIX)${dir}
+        mkdir -p $(PREFIX)${dir}
 .endfor
 .for file in $(BINFILES)
@@ -42 +45 @@
         install $(INFLAGS) ${file} $(PREFIX)/etc/env.d/
 .endfor
+.for file in $(MAN5)
+        install $(INFLAGS) ${file} $(MANPREFIX)/man5
+.endfor
+.for file in $(MAN8)
+        install $(INFLAGS) ${file} $(MANPREFIX)/man8
+.endfor
         install -Sp -o root -g wheel -m 0444 confman.conf \
                 $(PREFIX)/etc/confman.conf-default
@@ -51 +60 @@
         rm .config
 
-fetch:
-        svn update
-