|
 |
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in argus-clients-2.0.6.fixes.1/clients/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in 2003-07-10 13:28:32.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/clients/Makefile.in 2006-02-24 14:35:36.000000000 -0500
|
|
|
cd137d5 |
@@ -42,11 +42,11 @@
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Top level hierarchy
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Pathname of install directory
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
SBINDIR = @sbindir@
|
|
|
cd137d5 |
@@ -163,17 +163,17 @@
|
|
|
cd137d5 |
OBJ = $(SRC:.c=.o)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
CLEANFILES = $(OBJ) $(PROGS)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install: force
|
|
|
cd137d5 |
- [ -d $(prefix) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(prefix); chmod 755 $(prefix))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(prefix) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- [ -d $(BINDIR) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(BINDIR); chmod 755 $(BINDIR))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(BINDIR) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(INSTALL) $(srcdir)/../bin/ra* $(BINDIR)
|
|
|
cd137d5 |
+ $(INSTALL) $(srcdir)/../bin/ra* $(DESTDIR)/$(BINDIR)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
clean:
|
|
|
cd137d5 |
rm -f $(CLEANFILES)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
distclean:
|
|
|
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/Makefile.in argus-clients-2.0.6.fixes.1/common/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/common/Makefile.in 2003-07-10 13:28:32.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/common/Makefile.in 2006-02-24 14:35:36.000000000 -0500
|
|
|
cd137d5 |
@@ -19,11 +19,11 @@
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Top level hierarchy
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
# Pathname of directory to install the include files
|
|
|
cd137d5 |
INCLDEST = @includedir@
|
|
|
cd137d5 |
# Pathname of directory to install the library
|
|
|
cd137d5 |
LIBDEST = @libdir@
|
|
|
cd137d5 |
@@ -129,18 +129,18 @@
|
|
|
cd137d5 |
version.c: $(srcdir)/../VERSION
|
|
|
cd137d5 |
@rm -f $@
|
|
|
cd137d5 |
sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install: force all
|
|
|
cd137d5 |
- [ -d $(LIBDEST) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(LIBDEST) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
|
|
|
cd137d5 |
- $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a
|
|
|
cd137d5 |
+ $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
|
|
|
cd137d5 |
+ $(INSTALL) $(srcdir)/../lib/argus_parse.a $(DESTDIR)/$(LIBDEST)/argus_parse.a
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(RANLIB) $(LIBDEST)/argus_common.a
|
|
|
cd137d5 |
- $(RANLIB) $(LIBDEST)/argus_parse.a
|
|
|
cd137d5 |
+ $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
|
|
|
cd137d5 |
+ $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
|
|
|
cd137d5 |
|
|
|
cd137d5 |
clean:
|
|
|
cd137d5 |
rm -f $(CLEANFILES)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
distclean:
|
|
|
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/Makefile.in argus-clients-2.0.6.fixes.1/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/Makefile.in 2003-07-10 13:28:29.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/Makefile.in 2006-02-24 14:35:36.000000000 -0500
|
|
|
cd137d5 |
@@ -27,14 +27,14 @@
|
|
|
cd137d5 |
LIBS = @LIBS@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
CFLAGS = -g
|
|
|
cd137d5 |
LDFLAGS = -g
|
|
|
cd137d5 |
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
srcdir = @srcdir@
|
|
|
cd137d5 |
-docdir = $(prefix)/share/doc/argus-2.0
|
|
|
cd137d5 |
+#docdir = $(prefix)/share/doc/argus-2.0
|
|
|
cd137d5 |
|
|
|
cd137d5 |
|
|
|
cd137d5 |
#### End of system configuration section. ####
|
|
|
cd137d5 |
|
|
|
cd137d5 |
SHELL = /bin/sh
|
|
|
cd137d5 |
@@ -63,108 +63,109 @@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
.PHONY: all
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install: force
|
|
|
cd137d5 |
make installdirs
|
|
|
cd137d5 |
- [ -d $(prefix) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(prefix); chmod 755 $(prefix))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(prefix) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- [ -d @sbindir@ ] || \
|
|
|
cd137d5 |
- (mkdir -p @sbindir@; chmod 755 @sbindir@)
|
|
|
cd137d5 |
+# [ -d @sbindir@ ] || \
|
|
|
cd137d5 |
+# (mkdir -p @sbindir@; chmod 755 @sbindir@)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- [ -d @bindir@ ] || \
|
|
|
cd137d5 |
- (mkdir -p @bindir@; chmod 755 @bindir@)
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/@bindir@ ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/@bindir@; chmod 755 $(DESTDIR)/@bindir@)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- [ -d $(exec_prefix)/argus ] || \
|
|
|
cd137d5 |
- (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- [ -d $(exec_prefix)/argus/archive ] || \
|
|
|
cd137d5 |
- (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive)
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- [ -d $(docdir) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(docdir); chmod 755 $(docdir))
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- [ -d $(docdir)/html ] || \
|
|
|
cd137d5 |
- (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html)
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- [ -d $(docdir)/html/man ] || \
|
|
|
cd137d5 |
- (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man)
|
|
|
cd137d5 |
+# [ -d $(exec_prefix)/argus ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# [ -d $(exec_prefix)/argus/archive ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive)
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# [ -d $(docdir) ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(docdir); chmod 755 $(docdir))
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# [ -d $(docdir)/html ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html)
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# [ -d $(docdir)/html/man ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
@for i in $(DIRS) ; do \
|
|
|
cd137d5 |
if [ -d $$i ] ; then \
|
|
|
cd137d5 |
echo "making in $$i"; \
|
|
|
cd137d5 |
cd $$i; \
|
|
|
cd137d5 |
make install; \
|
|
|
cd137d5 |
cd ..; \
|
|
|
cd137d5 |
fi; \
|
|
|
cd137d5 |
done
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir)
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir)
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/README $(docdir)
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
|
|
|
cd137d5 |
- $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- [ -d @mandir@ ] || \
|
|
|
cd137d5 |
- (mkdir -p @mandir@; chmod 755 @mandir@)
|
|
|
cd137d5 |
- [ -d @mandir@/man1 ] || \
|
|
|
cd137d5 |
- (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir)
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir)
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/README $(docdir)
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
|
|
|
cd137d5 |
+# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
|
|
|
cd137d5 |
+#
|
|
|
cd137d5 |
+# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
|
|
|
cd137d5 |
+
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/@mandir@ ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@)
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/@mandir@/man1 ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/@mandir@/man1; chmod 755 $(DESTDIR)/@mandir@/man1)
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 \
|
|
|
cd137d5 |
- @mandir@/man1/ra.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/ra.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 \
|
|
|
cd137d5 |
- @mandir@/man1/racount.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/racount.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 \
|
|
|
cd137d5 |
- @mandir@/man1/ragator.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/ragator.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/rahosts.1 \
|
|
|
cd137d5 |
- @mandir@/man1/rahosts.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/rahosts.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 \
|
|
|
cd137d5 |
- @mandir@/man1/ramon.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/ramon.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/ranonymize.1 \
|
|
|
cd137d5 |
- @mandir@/man1/ranonymize.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/ranonymize.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/rapolicy.1 \
|
|
|
cd137d5 |
- @mandir@/man1/rapolicy.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/rapolicy.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 \
|
|
|
cd137d5 |
- @mandir@/man1/rasort.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/rasort.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/rastrip.1 \
|
|
|
cd137d5 |
- @mandir@/man1/rastrip.1
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/rastrip.1
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 \
|
|
|
cd137d5 |
- @mandir@/man1/raxml.1
|
|
|
cd137d5 |
- [ -d @mandir@/man5 ] || \
|
|
|
cd137d5 |
- (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man1/raxml.1
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/@mandir@/man5 ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5)
|
|
|
cd137d5 |
$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 \
|
|
|
cd137d5 |
- @mandir@/man5/rarc.5
|
|
|
cd137d5 |
+ $(DESTDIR)/@mandir@/man5/rarc.5
|
|
|
cd137d5 |
+
|
|
|
cd137d5 |
uninstall:
|
|
|
cd137d5 |
- rm -f @bindir@/argusbug
|
|
|
cd137d5 |
- rm -f @bindir@/ra
|
|
|
cd137d5 |
- rm -f @bindir@/racount
|
|
|
cd137d5 |
- rm -f @bindir@/ragator
|
|
|
cd137d5 |
- rm -f @bindir@/rahistogram
|
|
|
cd137d5 |
- rm -f @bindir@/rahosts
|
|
|
cd137d5 |
- rm -f @bindir@/rarpwatch
|
|
|
cd137d5 |
- rm -f @bindir@/raseq
|
|
|
cd137d5 |
- rm -f @bindir@/rasrvstats
|
|
|
cd137d5 |
- rm -f @bindir@/ratop
|
|
|
cd137d5 |
- rm -f @bindir@/raxml
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- rm -f @mandir@/man1/ra.1
|
|
|
cd137d5 |
- rm -f @mandir@/man1/racount.1
|
|
|
cd137d5 |
- rm -f @mandir@/man1/ragator.1
|
|
|
cd137d5 |
- rm -f @mandir@/man1/rasort.1
|
|
|
cd137d5 |
- rm -f @mandir@/man1/raxml.1
|
|
|
cd137d5 |
- rm -f @mandir@/man1/tcpdump.1
|
|
|
cd137d5 |
- rm -f @mandir@/man5/argus.5
|
|
|
cd137d5 |
- rm -f @mandir@/man5/argus.conf.5
|
|
|
cd137d5 |
- rm -f @mandir@/man5/rarc.5
|
|
|
cd137d5 |
-
|
|
|
cd137d5 |
- rm -rf $(docdir)
|
|
|
cd137d5 |
- rm -f $(exec_prefix)/argus/COPYING
|
|
|
cd137d5 |
- rm -f $(exec_prefix)/argus/README
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/argusbug
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/ra
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/racount
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/ragator
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/rahistogram
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/rahosts
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/rarpwatch
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/raseq
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/rasrvstats
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/ratop
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@bindir@/raxml
|
|
|
cd137d5 |
+
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/ra.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/racount.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/ragator.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/rasort.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/raxml.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man1/tcpdump.1
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man5/argus.5
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5
|
|
|
cd137d5 |
+ rm -f $(DESTDIR)/@mandir@/man5/rarc.5
|
|
|
cd137d5 |
+
|
|
|
cd137d5 |
+ #rm -rf $(docdir)
|
|
|
cd137d5 |
+ #rm -f $(exec_prefix)/argus/COPYING
|
|
|
cd137d5 |
+ #rm -f $(exec_prefix)/argus/README
|
|
|
cd137d5 |
|
|
|
cd137d5 |
installdirs:
|
|
|
cd137d5 |
${srcdir}/config/mkinstalldirs $(bindir) $(infodir)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
Makefile: Makefile.in config.status
|
|
|
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in argus-clients-2.0.6.fixes.1/ragraph/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in 2003-07-10 13:28:32.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/ragraph/Makefile.in 2006-02-24 14:35:36.000000000 -0500
|
|
|
cd137d5 |
@@ -20,11 +20,11 @@
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Top level hierarchy
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
SBINDIR = @sbindir@
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
@@ -92,18 +92,18 @@
|
|
|
cd137d5 |
OBJ = $(SRC:.c=.o)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
CLEANFILES = $(OBJ) $(PROGS)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install: force all
|
|
|
cd137d5 |
- [ -d $(DESTDIR) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR))
|
|
|
cd137d5 |
+# [ -d $(DESTDIR) ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- [ -d $(BINDIR) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(BINDIR); chmod 755 $(BINDIR))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(BINDIR) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(INSTALL) @INSTALL_BIN@/rahistogram $(BINDIR)
|
|
|
cd137d5 |
- $(INSTALL) @INSTALL_BIN@/ragraph $(BINDIR)
|
|
|
cd137d5 |
+ $(INSTALL) @INSTALL_BIN@/rahistogram $(DESTDIR)/$(BINDIR)
|
|
|
cd137d5 |
+ $(INSTALL) @INSTALL_BIN@/ragraph $(DESTDIR)/$(BINDIR)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
clean:
|
|
|
cd137d5 |
rm -f $(CLEANFILES)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
distclean:
|
|
|
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in argus-clients-2.0.6.fixes.1/ragrep/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in 2003-07-10 13:28:32.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/ragrep/Makefile.in 2006-02-24 14:36:43.000000000 -0500
|
|
|
cd137d5 |
@@ -13,11 +13,11 @@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
|
|
|
cd137d5 |
SHELL = /bin/sh
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Top level hierarchy
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
SBINDIR = @sbindir@
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
@@ -188,16 +188,17 @@
|
|
|
cd137d5 |
maintainer-clean-binPROGRAMS:
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install-binPROGRAMS: $(bin_PROGRAMS)
|
|
|
cd137d5 |
@$(NORMAL_INSTALL)
|
|
|
cd137d5 |
$(mkinstalldirs) $(BINDIR)
|
|
|
cd137d5 |
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
|
cd137d5 |
- if test -f $$p; then \
|
|
|
cd137d5 |
- echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
|
|
cd137d5 |
- $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
|
cd137d5 |
- else :; fi; \
|
|
|
cd137d5 |
- done
|
|
|
cd137d5 |
+# installation of binaries handled by toplevel makefile
|
|
|
cd137d5 |
+# @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
|
cd137d5 |
+# if test -f $$p; then \
|
|
|
cd137d5 |
+# echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
|
|
cd137d5 |
+# $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
|
cd137d5 |
+# else :; fi; \
|
|
|
cd137d5 |
+# done
|
|
|
cd137d5 |
|
|
|
cd137d5 |
uninstall-binPROGRAMS:
|
|
|
cd137d5 |
@$(NORMAL_UNINSTALL)
|
|
|
cd137d5 |
list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
|
cd137d5 |
rm -f $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
|
cd137d5 |
diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in argus-clients-2.0.6.fixes.1/ratop/Makefile.in
|
|
|
cd137d5 |
--- argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in 2003-07-10 13:28:32.000000000 -0400
|
|
|
cd137d5 |
+++ argus-clients-2.0.6.fixes.1/ratop/Makefile.in 2006-02-24 14:35:36.000000000 -0500
|
|
|
cd137d5 |
@@ -19,11 +19,11 @@
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
|
|
cd137d5 |
#
|
|
|
cd137d5 |
|
|
|
cd137d5 |
# Top level hierarchy
|
|
|
cd137d5 |
-prefix = $(DESTDIR)@prefix@
|
|
|
cd137d5 |
+prefix = @prefix@
|
|
|
cd137d5 |
exec_prefix = @exec_prefix@
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
SBINDIR = @sbindir@
|
|
|
cd137d5 |
# Pathname of directory to install the system binaries
|
|
|
cd137d5 |
BINDIR = @bindir@
|
|
|
cd137d5 |
@@ -86,18 +86,18 @@
|
|
|
cd137d5 |
OBJ = $(SRC:.c=.o)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
CLEANFILES = $(OBJ) $(PROGS)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
install: force all
|
|
|
cd137d5 |
- [ -d $(DESTDIR) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR))
|
|
|
cd137d5 |
- [ -d $(prefix) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(prefix); chmod 755 $(prefix))
|
|
|
cd137d5 |
- [ -d $(BINDIR) ] || \
|
|
|
cd137d5 |
- (mkdir -p $(BINDIR); chmod 755 $(BINDIR))
|
|
|
cd137d5 |
+# [ -d $(DESTDIR) ] || \
|
|
|
cd137d5 |
+# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(prefix) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix))
|
|
|
cd137d5 |
+ [ -d $(DESTDIR)/$(BINDIR) ] || \
|
|
|
cd137d5 |
+ (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR))
|
|
|
cd137d5 |
|
|
|
cd137d5 |
- $(INSTALL) @INSTALL_BIN@/ratop $(BINDIR)
|
|
|
cd137d5 |
+ $(INSTALL) @INSTALL_BIN@/ratop $(DESTDIR)/$(BINDIR)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
clean:
|
|
|
cd137d5 |
rm -f $(CLEANFILES)
|
|
|
cd137d5 |
|
|
|
cd137d5 |
distclean:
|