MIB compilation moved to MIB makefile from root makefile
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 10 Dec 2015 16:46:58 +0000 (18:46 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 10 Dec 2015 16:46:58 +0000 (18:46 +0200)
Makefile.am
contrib/mibs/Makefile.am

index 7475691..96b9a6b 100644 (file)
@@ -11,7 +11,7 @@
 ACLOCAL_AMFLAGS = -I m4
 BUILT_SOURCES = netxms-build-tag.h
 EXTRA_DIST = reconf configure netxms.sln README.HPUX netxms-build-tag.h
-SUBDIRS = . m4 contrib src doc tools
+SUBDIRS = . m4 src doc tools contrib
 SUBDIRS += @TOP_LEVEL_MODULES@
 
 netxms-build-tag.h: update-tag
@@ -23,4 +23,3 @@ update-tag:
 
 install-exec-hook:
        if test "x@BUILD_SDK@" = "xyes"; then mkdir -p $(DESTDIR)$(includedir); cp config.h $(DESTDIR)$(includedir); cp netxms-build-tag.h $(DESTDIR)$(includedir); mkdir -p $(DESTDIR)$(pkgdatadir)/sdk; cp libtool $(DESTDIR)$(pkgdatadir)/sdk; cp config/install-sh $(DESTDIR)$(pkgdatadir)/sdk; fi
-       if test "x@BUILD_SERVER@" = "xyes"; then LD_LIBRARY_PATH="$(DESTDIR)$(libdir):@INSTALL_LIBPATH@:${LD_LIBRARY_PATH}" $(DESTDIR)$(bindir)/nxmibc -d $(DESTDIR)$(pkgdatadir)/mibs -o $(DESTDIR)$(localstatedir)/lib/netxms/netxms.mib; fi
index a7749d3..e8b1806 100644 (file)
@@ -614,3 +614,6 @@ mibs_DATA = \
        ZONE-DEFENSE-MGMT-MIB.txt
  
 EXTRA_DIST=$(mibs_DATA)
+
+install-data-hook:
+       if test "x@BUILD_SERVER@" = "xyes"; then LD_LIBRARY_PATH="$(DESTDIR)$(libdir):@INSTALL_LIBPATH@:${LD_LIBRARY_PATH}" $(DESTDIR)$(bindir)/nxmibc -d $(DESTDIR)$(pkgdatadir)/mibs -o $(DESTDIR)$(localstatedir)/lib/netxms/netxms.mib; fi