|
1 --- sudo-1.7.4p4/Makefile.in.orig Fri Sep 3 14:43:57 2010 |
|
2 +++ sudo-1.7.4p4/Makefile.in Wed May 25 14:19:46 2011 |
|
3 @@ -86,6 +86,9 @@ |
|
4 mandirsu = $(mandir)/$(mantype)$(mansectsu) |
|
5 mandirform = $(mandir)/$(mantype)$(mansectform) |
|
6 |
|
7 +datadir = @datadir@ |
|
8 +ldifdir = $(datadir)/lib/ldif |
|
9 + |
|
10 # User and group ids the installed files should be "owned" by |
|
11 install_uid = 0 |
|
12 install_gid = 0 |
|
13 @@ -205,8 +208,10 @@ |
|
14 $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c |
|
15 |
|
16 libsudo_noexec.la: sudo_noexec.lo |
|
17 - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) |
|
18 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) |
|
19 |
|
20 +libsudo_noexec: libsudo_noexec.la |
|
21 + |
|
22 # Uncomment the following if you want "make distclean" to clean the parser |
|
23 @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate |
|
24 |
|
25 @@ -475,45 +480,52 @@ |
|
26 hg log --style=changelog -b default --date '<2010-01-18 00:00:00' >> $@; \ |
|
27 fi |
|
28 |
|
29 -install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc |
|
30 +install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc install-ldif |
|
31 |
|
32 +# only create $(MACH64) directory if $(MACH64) is set to a non-empty string |
|
33 install-dirs: |
|
34 $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \ |
|
35 - $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \ |
|
36 + $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir)/$(MACH64) \ |
|
37 $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ |
|
38 - $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) |
|
39 - $(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir) |
|
40 + $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \ |
|
41 + $(DESTDIR)$(ldifdir) |
|
42 |
|
43 install-binaries: install-dirs $(PROGS) |
|
44 - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo |
|
45 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 04511 sudo $(DESTDIR)$(sudodir)/sudo |
|
46 rm -f $(DESTDIR)$(sudodir)/sudoedit |
|
47 ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit |
|
48 - if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi |
|
49 - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo |
|
50 - if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi |
|
51 + if [ -f sudoreplay ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi |
|
52 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 visudo $(DESTDIR)$(visudodir)/visudo |
|
53 + if [ -f sesh ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 sesh $(DESTDIR)$(libexecdir)/sesh; fi |
|
54 |
|
55 + # XXX only installs into $(MACH64) directory if $(MACH64) is non-empty |
|
56 install-noexec: install-dirs libsudo_noexec.la |
|
57 - if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi |
|
58 + if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(MACH64)/$(noexecfile); fi |
|
59 |
|
60 install-sudoers: install-dirs |
|
61 - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ |
|
62 + $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \ |
|
63 $(DESTDIR)$(sudoersdir)/sudoers.d |
|
64 test -f $(DESTDIR)$(sudoersdir)/sudoers || \ |
|
65 - $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \ |
|
66 + $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \ |
|
67 sudoers $(DESTDIR)$(sudoersdir)/sudoers |
|
68 |
|
69 install-doc: install-dirs ChangeLog |
|
70 - (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done) |
|
71 - @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done) |
|
72 - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) |
|
73 + (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done) |
|
74 + @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done) |
|
75 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) |
|
76 @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) |
|
77 ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) |
|
78 - @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) |
|
79 - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) |
|
80 - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) |
|
81 - @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) |
|
82 + @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) |
|
83 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) |
|
84 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) |
|
85 + @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) |
|
86 @MAN_POSTINSTALL@ |
|
87 |
|
88 +install-ldif: |
|
89 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.OpenLDAP $(DESTDIR)$(ldifdir)/sudo-schema.OpenLDAP |
|
90 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.iPlanet $(DESTDIR)$(ldifdir)/sudo-schema.iPlanet |
|
91 + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/sudoers2ldif $(DESTDIR)$(ldifdir)/sudoers2ldif |
|
92 + |
|
93 check: |
|
94 @echo nothing to check |
|
95 |