cgi-fcgi-interp: Add -D

[chiark-utils.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 4a71bee698fdbb864d86dc604064bd82c0cba312..5a8d028300169208cf88fe34b02fcbdd94e60c3c 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,7 +8,7 @@
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -16,35 +16,36 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
-SYSTEM_GROUP=  root
+include ../settings.make
 
-INSTALL=               install -c
-INSTALL_SHARE=         $(INSTALL) -m 644 -o root -g $(SYSTEM_GROUP)
-INSTALL_SCRIPT=                $(INSTALL) -m 755 -o root -g $(SYSTEM_GROUP)
-INSTALL_DIRECTORY=     $(INSTALL) -m 2755 -o root -g $(SYSTEM_GROUP) -d
+SCRIPTS=       palm-datebook-reminders random-word expire-iso8601 \
+               genspic2gnuplot gnucap2genspic ngspice2genspic \
+               cvs-repomove cvs-adjustroot remountresizereiserfs \
+               hexterm summarise-mailbox-preserving-privacy \
+               git-cache-proxy
+MANPAGES1=     palm-datebook-reminders
 
-prefix=/usr/local
-bindir=$(prefix)/bin
-mandir=${prefix}/man
-man8dir=${mandir}/man8
-
-SCRIPTS=       named-conf
-MANPAGES8=     named-conf
+CSCRIPTS=      named-conf
+CMANPAGES8=    named-conf
 
 all:
 
 install:
                $(INSTALL_DIRECTORY) $(bindir)
                set -e; for f in $(SCRIPTS); do \
+                       $(INSTALL_SCRIPT) $$f $(bindir)/$$f; done
+               set -e; for f in $(CSCRIPTS); do \
                        $(INSTALL_SCRIPT) $$f $(bindir)/chiark-$$f; done
 
 install-docs:
-               $(INSTALL_DIRECTORY) $(man8dir)
-               set -e; for f in $(MANPAGES8); do \
-                       $(INSTALL_SCRIPT) $$f.8 $(man8dir)/chiark-$$f.8; done
+               $(INSTALL_DIRECTORY) $(man1dir) $(man8dir)
+               set -e; for f in $(MANPAGES1); do \
+                       $(INSTALL_SHARE) $$f.1 $(man1dir)/$$f.1; done
+               set -e; for f in $(CMANPAGES8); do \
+                       $(INSTALL_SHARE) $$f.8 $(man8dir)/chiark-$$f.8; done
 
 install-examples: