Lines 1-14
Link Here
|
1 |
--- etc/Makefile.in.orig 2003-10-02 16:59:32.000000000 +0100 |
1 |
--- etc/Makefile.in.orig 2003-10-02 16:59:32.000000000 +0100 |
2 |
+++ etc/Makefile.in 2010-07-04 03:34:26.379748720 +0100 |
2 |
+++ etc/Makefile.in 2014-05-10 17:29:11.995407415 +0100 |
3 |
@@ -84,19 +84,19 @@ |
3 |
@@ -84,19 +84,19 @@ |
4 |
install_sh = @install_sh@ |
4 |
install_sh = @install_sh@ |
5 |
|
5 |
|
6 |
top_builddir = .. |
6 |
top_builddir = .. |
7 |
-etcdir = /etc |
7 |
-etcdir = /etc |
8 |
-webdir = /web |
8 |
-webdir = /web |
|
|
9 |
-reportsdir = /bin |
9 |
+etcdir = @etcdir@ |
10 |
+etcdir = @etcdir@ |
10 |
+webdir = @webdir@ |
11 |
+webdir = @webdir@ |
11 |
reportsdir = /bin |
12 |
+reportsdir = @bindir@ |
12 |
|
13 |
|
13 |
-ETC = rtg.conf rtgtargmkr.pl routers createdb BER.pm \ |
14 |
-ETC = rtg.conf rtgtargmkr.pl routers createdb BER.pm \ |
14 |
+ETC = rtg.conf.sample rtgtargmkr.pl routers.sample createdb BER.pm \ |
15 |
+ETC = rtg.conf.sample rtgtargmkr.pl routers.sample createdb BER.pm \ |
Lines 25-45
Link Here
|
25 |
|
26 |
|
26 |
subdir = etc |
27 |
subdir = etc |
27 |
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs |
28 |
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs |
28 |
@@ -220,13 +220,13 @@ |
29 |
@@ -220,14 +220,14 @@ |
29 |
all: |
30 |
all: |
30 |
|
31 |
|
31 |
install: installdirs |
32 |
install: installdirs |
32 |
- @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(etcdir) ; echo "install: installed $$i in $(prefix)$(etcdir)" ; done |
33 |
- @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(etcdir) ; echo "install: installed $$i in $(prefix)$(etcdir)" ; done |
33 |
- @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(webdir) ; echo "install: installed $$i in $(prefix)$(webdir)" ; done |
34 |
- @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(webdir) ; echo "install: installed $$i in $(prefix)$(webdir)" ; done |
34 |
+ @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(etcdir) ; echo "install: installed $$i in $(etcdir)" ; done |
35 |
- @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(reportsdir) ; echo "install: installed $$i in $(prefix)$(reportsdir)" ; done |
35 |
+ @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(webdir) ; echo "install: installed $$i in $(webdir)" ; done |
36 |
+ @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(etcdir) ; echo "install: installed $$i in $(DESTDIR)$(etcdir)" ; done |
36 |
@for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(reportsdir) ; echo "install: installed $$i in $(prefix)$(reportsdir)" ; done |
37 |
+ @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(webdir) ; echo "install: installed $$i in $(DESTDIR)$(webdir)" ; done |
|
|
38 |
+ @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(reportsdir) ; echo "install: installed $$i in $(DESTDIR)$(reportsdir)" ; done |
37 |
|
39 |
|
38 |
installdirs: |
40 |
installdirs: |
39 |
- $(mkinstalldirs) $(prefix)$(etcdir) |
41 |
- $(mkinstalldirs) $(prefix)$(etcdir) |
40 |
- $(mkinstalldirs) $(prefix)$(webdir) |
42 |
- $(mkinstalldirs) $(prefix)$(webdir) |
41 |
+ $(mkinstalldirs) $(etcdir) |
43 |
- $(mkinstalldirs) $(prefix)$(reportsdir) |
42 |
+ $(mkinstalldirs) $(webdir) |
44 |
+ $(mkinstalldirs) $(DESTDIR)$(etcdir) |
43 |
$(mkinstalldirs) $(prefix)$(reportsdir) |
45 |
+ $(mkinstalldirs) $(DESTDIR)$(webdir) |
|
|
46 |
+ $(mkinstalldirs) $(DESTDIR)$(reportsdir) |
44 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
47 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
45 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
48 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
|
|
49 |
.NOEXPORT: |