- plugins - stil don't build,

- Makefile - patch removing -version-info and adding $DESTDIR do cert.pem,

Changed files:
    ntop-Makefile.patch -> 1.1
    ntop-plugins-Makefile.patch -> 1.2

diff --git a/ntop-Makefile.patch b/ntop-Makefile.patch
new file mode 100644 (file)
index 0000000..d802ed7
--- /dev/null
+++ b/ntop-Makefile.patch
@@ -0,0 +1,29 @@
+--- Makefile.am.orig   Tue Mar 26 09:48:59 2002
++++ Makefile.am        Tue Mar 26 09:50:10 2002
+@@ -128,7 +128,7 @@
+ 
+ libntop_la_DEPENDENCIES = config.h
+ libntop_la_LIBADD       = $(CORELIBS)
+-libntop_la_LDFLAGS      = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
++libntop_la_LDFLAGS      = -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
+ 
+ # Archive for http representation, or the 'viewer'
+ libntopreport_la_SOURCES = admin.c emitter.c \
+@@ -142,7 +142,7 @@
+ 
+ libntopreport_la_DEPENDENCIES = config.h
+ libntopreport_la_LIBADD       = $(MORELIBS)
+-libntopreport_la_LDFLAGS      = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
++libntopreport_la_LDFLAGS      = -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
+ 
+ man_MANS = ntop.8 intop/intop.1
+ 
+@@ -218,7 +218,7 @@
+       /bin/rm -f privkey.pem cert.pem
+ 
+ install-data-local:
+-      @cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
++      @cp -p ntop-cert.pem $(DESTDIR)/$(bindir)/ntop-cert.pem
+       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
+       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop;
+       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop/html;

diff --git a/ntop-plugins-Makefile.patch b/ntop-plugins-Makefile.patch
index a38f6978ae66377a6285ffd5aa4bf9f9601e0d57..06839b6b9d773c1410340726f82e0c8c42036b95 100644 (file)
--- a/ntop-plugins-Makefile.patch
+++ b/ntop-plugins-Makefile.patch
@@ -1,18 +1,47 @@
---- Makefile.am.orig   Mon Mar 25 22:11:50 2002
-+++ Makefile.am        Mon Mar 25 22:27:25 2002
-@@ -78,27 +78,15 @@
+--- Makefile.am        Tue Mar 26 01:26:33 2002
++++ Makefile.am.new    Tue Mar 26 01:28:27 2002
+@@ -51,22 +51,22 @@
+ #               librmonPlugin.la libwapPlugin.la
+ 
+ libicmpPlugin_la_SOURCES = icmpPlugin.c
+-libicmpPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++libicmpPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
+ 
+ libsflowPlugin_la_SOURCES = sflowPlugin.c
+-libsflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++libsflowPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
+ 
+ liblastSeenPlugin_la_SOURCES = lastSeenPlugin.c
+-liblastSeenPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++liblastSeenPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
+ 
+ libnfsPlugin_la_SOURCES = nfsPlugin.c
+-libnfsPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++libnfsPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
+ 
+ #librmonPlugin_la_SOURCES = rmonPlugin.c rmon.h
+-#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared @DYN_FLAGS@
+ 
+ #libwapPlugin_la_SOURCES = wapPlugin.c
+-#libwapPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++#libwapPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
+ 
+ 
+ #
+@@ -78,27 +78,17 @@
  .libs/libicmpPlugin.so@SO_VERSION_PATCH@:
        cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
  
 -icmpPlugin.so: .libs/libicmpPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/libicmpPlugin.so icmpPlugin.so
--
+ 
  .libs/libsflowPlugin.so@SO_VERSION_PATCH@:
        cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
  
 -sflowPlugin.so: .libs/libsflowPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/libsflowPlugin.so sflowPlugin.so
--
+ 
  .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
        cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o