Lines 1-6
Link Here
|
1 |
--- gnats/Makefile.in.orig Sun Jul 27 01:23:17 2003 |
1 |
--- gnats/Makefile.in.orig Thu Feb 24 22:35:55 2005 |
2 |
+++ gnats/Makefile.in Thu Sep 25 02:30:32 2003 |
2 |
+++ gnats/Makefile.in Mon Aug 1 15:08:51 2005 |
3 |
@@ -91,7 +91,7 @@ |
3 |
@@ -93,7 +93,7 @@ |
4 |
|
4 |
|
5 |
INSTALL = $(srcdir)/../install-sh -c |
5 |
INSTALL = $(srcdir)/../install-sh -c |
6 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
6 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
Lines 9-15
Link Here
|
9 |
INSTALL_DATA = @INSTALL_DATA@ |
9 |
INSTALL_DATA = @INSTALL_DATA@ |
10 |
|
10 |
|
11 |
SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'` |
11 |
SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'` |
12 |
@@ -107,6 +107,7 @@ |
12 |
@@ -109,6 +109,7 @@ |
13 |
libdir = @libdir@ |
13 |
libdir = @libdir@ |
14 |
libexecdir = @libexecdir@ |
14 |
libexecdir = @libexecdir@ |
15 |
statedir = @datadir@ |
15 |
statedir = @datadir@ |
Lines 17-100
Link Here
|
17 |
sysconfdir = @sysconfdir@ |
17 |
sysconfdir = @sysconfdir@ |
18 |
|
18 |
|
19 |
program_transform_name = |
19 |
program_transform_name = |
20 |
@@ -163,7 +164,7 @@ |
20 |
@@ -162,7 +163,7 @@ |
21 |
check-db delete-pr dbconfig gnats-databases gnats-pwconv $(EXTRA_STUFF) |
21 |
check-db delete-pr dbconfig gnats-databases gnats-pwconv $(EXTRA_STUFF) |
22 |
|
22 |
|
23 |
all-tools: libgnats.a query-pr pr-age pr-edit edit-pr file-pr getclose \ |
23 |
all-tools: libgnats.a query-pr pr-age pr-edit edit-pr file-pr getclose \ |
24 |
- config-send-pr mail-agent dbconfig |
24 |
- config-send-pr mail-agent dbconfig diff-prs |
25 |
+ mail-agent dbconfig |
25 |
+ mail-agent dbconfig diff-prs |
26 |
|
26 |
|
27 |
libgnats.a: $(LIBOBJS) |
27 |
libgnats.a: $(LIBOBJS) |
28 |
-rm -f tmplibgnats.a libgnats.a |
28 |
-rm -f tmplibgnats.a libgnats.a |
29 |
@@ -363,15 +364,17 @@ |
29 |
@@ -368,15 +369,17 @@ |
30 |
install-tools-arch-dep: install-tools-bin |
30 |
install-tools-arch-dep: install-tools-bin |
31 |
|
31 |
|
32 |
install-tools-arch-indep: all-tools |
32 |
install-tools-arch-indep: all-tools |
33 |
- $(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gnats |
33 |
- $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats |
34 |
+ $(SHELL) $(srcdir)/../mkinstalldirs $(sharedstatedir) |
34 |
+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sharedstatedir)/gnats |
35 |
$(SHELL) $(srcdir)/../mkinstalldirs $(sysconfdir)/gnats/defaults |
35 |
$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults |
36 |
@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
36 |
@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
37 |
- echo "chown $(GNATS_USER) $(datadir)/gnats" ; \ |
37 |
- echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \ |
38 |
- chown $(GNATS_USER) $(datadir)/gnats ; \ |
38 |
- chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \ |
39 |
+ echo "chown $(GNATS_USER) $(sharedstatedir)" ; \ |
39 |
+ echo "chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \ |
40 |
+ chown $(GNATS_USER) $(sharedstatedir) ; \ |
40 |
+ chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats ; \ |
41 |
else \ |
41 |
else \ |
42 |
- echo "*** Warning: Must chown $(GNATS_USER) $(datadir)/gnats" ; \ |
42 |
- echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \ |
43 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(sharedstatedir)" ; \ |
43 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \ |
44 |
+ fi |
44 |
+ fi |
45 |
+ @if [ x"$(lispdir)" != x ]; then \ |
45 |
+ @if [ x"$(lispdir)" != x ]; then \ |
46 |
+ $(INSTALL_DATA) $(srcdir)/gnats.el $(lispdir)/gnats.el ; \ |
46 |
+ $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el ; \ |
47 |
fi |
47 |
fi |
48 |
- $(INSTALL_DATA) $(srcdir)/gnats.el $(lispdir)/gnats.el |
48 |
- $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el |
49 |
for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \ |
49 |
for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \ |
50 |
if [ -f "$$i" ] ; then \ |
50 |
if [ -f "$$i" ] ; then \ |
51 |
$(INSTALL_DATA) $$i $(sysconfdir)/gnats/defaults/$$i ; \ |
51 |
$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \ |
52 |
@@ -386,7 +389,7 @@ |
52 |
@@ -391,7 +394,7 @@ |
53 |
$(INSTALL_SCRIPT) edit-pr $(bindir)/edit-pr |
53 |
$(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr |
54 |
$(INSTALL_SCRIPT) $(srcdir)/diff-prs $(libexecdir)/gnats/diff-prs |
54 |
$(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs |
55 |
$(INSTALL_SCRIPT) mail-agent $(libexecdir)/gnats/mail-agent |
55 |
$(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent |
56 |
- $(INSTALL_PROGRAM) file-pr $(libexecdir)/gnats/file-pr |
56 |
- $(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr |
57 |
+ $(INSTALL_SCRIPT) file-pr $(libexecdir)/gnats/file-pr |
57 |
+ $(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr |
58 |
$(INSTALL_PROGRAM) pr-age $(libexecdir)/gnats/pr-age |
58 |
$(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age |
59 |
$(INSTALL_PROGRAM) pr-edit $(libexecdir)/gnats/pr-edit |
59 |
$(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit |
60 |
@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
60 |
@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
61 |
@@ -404,29 +407,29 @@ |
61 |
@@ -409,29 +412,29 @@ |
62 |
install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL) |
62 |
install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL) |
63 |
|
63 |
|
64 |
install-gnats-arch-indep: all-gnats install-tools-arch-indep |
64 |
install-gnats-arch-indep: all-gnats install-tools-arch-indep |
65 |
- @if [ -f $(GLOBAL_DB_LIST_FILE) ]; then \ |
65 |
- @if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \ |
66 |
- echo "Not putting gnats-databases file in $(GLOBAL_DB_LIST_FILE), it's already there." ; \ |
66 |
- echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \ |
67 |
+ @if [ -f $(GLOBAL_DB_LIST_FILE).default ]; then \ |
67 |
+ @if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ]; then \ |
68 |
+ echo "Not putting gnats-databases file in $(GLOBAL_DB_LIST_FILE).default, it's already there." ; \ |
68 |
+ echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default, it's already there." ; \ |
69 |
true ; \ |
69 |
true ; \ |
70 |
else \ |
70 |
else \ |
71 |
if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
71 |
if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
72 |
$(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \ |
72 |
$(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \ |
73 |
- $(GLOBAL_DB_LIST_FILE) ; \ |
73 |
- $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \ |
74 |
+ $(GLOBAL_DB_LIST_FILE).default ; \ |
74 |
+ $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \ |
75 |
else \ |
75 |
else \ |
76 |
- $(INSTALL_DATA) gnats-databases $(GLOBAL_DB_LIST_FILE) ; \ |
76 |
- $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \ |
77 |
- echo "*** Warning: Must chown $(GNATS_USER) $(GLOBAL_DB_LIST_FILE)" ; \ |
77 |
- echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \ |
78 |
+ $(INSTALL_DATA) gnats-databases $(GLOBAL_DB_LIST_FILE).default ; \ |
78 |
+ $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \ |
79 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(GLOBAL_DB_LIST_FILE).default" ; \ |
79 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default" ; \ |
80 |
fi \ |
80 |
fi \ |
81 |
fi |
81 |
fi |
82 |
- @if [ -f $(GNATSD_HOST_ACCESS_FILE) ]; then \ |
82 |
- @if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \ |
83 |
- echo "Not putting gnats.host_access file in $(GNATSD_HOST_ACCESS_FILE), it's already there." ; \ |
83 |
- echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \ |
84 |
+ @if [ -f $(GNATSD_HOST_ACCESS_FILE).default ]; then \ |
84 |
+ @if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ]; then \ |
85 |
+ echo "Not putting gnats.host_access file in $(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \ |
85 |
+ echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \ |
86 |
true ; \ |
86 |
true ; \ |
87 |
else \ |
87 |
else \ |
88 |
if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
88 |
if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ |
89 |
$(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \ |
89 |
$(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \ |
90 |
- $(GNATSD_HOST_ACCESS_FILE) ; \ |
90 |
- $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \ |
91 |
+ $(GNATSD_HOST_ACCESS_FILE).default ; \ |
91 |
+ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \ |
92 |
else \ |
92 |
else \ |
93 |
$(INSTALL_DATA) $(srcdir)/gnatsd.host_access \ |
93 |
$(INSTALL_DATA) $(srcdir)/gnatsd.host_access \ |
94 |
- $(GNATSD_HOST_ACCESS_FILE) ; \ |
94 |
- $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \ |
95 |
- echo "*** Warning: Must chown $(GNATS_USER) $(GNATSD_HOST_ACCESS_FILE)" ; \ |
95 |
- echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \ |
96 |
+ $(GNATSD_HOST_ACCESS_FILE).default ; \ |
96 |
+ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \ |
97 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(GNATSD_HOST_ACCESS_FILE).default" ; \ |
97 |
+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default" ; \ |
98 |
fi \ |
98 |
fi \ |
99 |
fi |
99 |
fi |
100 |
@echo "*** If you're a first-time user, you'll want to create a new database"; |
100 |
@echo "*** If you're a first-time user, you'll want to create a new database"; |