Makefile.binary -> Makefile.binary.in for config.status substitution

Add support for installing noexec bits

diff --git a/Makefile.binary b/Makefile.binary.in
similarity index 68%
rename from Makefile.binary
rename to Makefile.binary.in
index db9a5771600af3641573fbadd15679ebed2c3014..a1c9696f28cc9ec14f9b945aa0b02cbbe9150fc4 100644 (file)
--- a/Makefile.binary
+++ b/Makefile.binary.in
@@ -19,16 +19,20 @@
 
 srcdir = .
 
+# For installing the shared lib
+LIBTOOL = @LIBTOOL@
+
 # Which install program?
 INSTALL = $(srcdir)/install-sh -c
 
 # Where to install things...
-prefix = /usr/local
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-sbindir = $(exec_prefix)/sbin
-sysconfdir = /etc
-mandir = $(prefix)/man
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+sysconfdir = @sysconfdir@
+mandir = @mandir@
+noexecdir = @NOEXECDIR@
 
 # Directory in which to install sudo.
 sudodir = $(bindir)
@@ -40,9 +44,9 @@ visudodir = $(sbindir)
 sudoersdir = $(sysconfdir)
 
 # Directory in which to install the man page
-mantype = @_MANTYPE@
-mansectsu = @_mansectsu@
-mansectform = @_mansectform@
+mantype = @MANTYPE@
+mansectsu = @mansectsu@
+mansectform = @mansectform@
 mandirsu = $(mandir)/$(mantype)$(mansectsu)
 mandirform = $(mandir)/$(mantype)$(mansectform)
 
@@ -51,38 +55,43 @@ install_uid = 0
 install_gid = 0
 
 # User, group, and mode the sudoers file should be "owned" by
-sudoers_uid = 0
-sudoers_gid = 0
-sudoers_mode = 0440
+sudoers_uid = @SUDOERS_UID@
+sudoers_gid = @SUDOERS_GID@
+sudoers_mode = @SUDOERS_MODE@
 
 SHELL = /bin/sh
 
-PROGS = sudo visudo
+PROGS = @PROGS@
 
 all: $(PROGS)
        @echo run 'make install' to install sudo
 
-install: install-dirs install-binaries install-sudoers install-man
+install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-man
 
 install-dirs:
        $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
            $(DESTDIR)$(visudodir) $(DESTDIR)$(sudoersdir) \
-           $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
+           $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
+           $(DESTDIR)$(noexecdir)
 
 install-binaries: $(PROGS)
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 sudo $(DESTDIR)$(sudodir)/sudo
        ln -f $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
 
+install-noexec: sudo_noexec.la
+       $(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
+
 install-sudoers:
        test -f $(DESTDIR)$(sudoersdir)/sudoers || \
            $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
                $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
 
 install-man:
-       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
-       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
-       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
+       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
+       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
+       $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
+@MAN_POSTINSTALL@
 
 check:
        @echo nothing to check