SPECS: cacti-plugin-npc.spec - re-entrant install

[glen]

Author: glen                         Date: Sun Oct  5 11:19:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- re-entrant install

---- Files affected:
SPECS:
   cacti-plugin-npc.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/cacti-plugin-npc.spec
diff -u SPECS/cacti-plugin-npc.spec:1.15 SPECS/cacti-plugin-npc.spec:1.16
--- SPECS/cacti-plugin-npc.spec:1.15	Sun Oct  5 13:18:07 2008
+++ SPECS/cacti-plugin-npc.spec	Sun Oct  5 13:19:00 2008
@@ -42,15 +42,14 @@
 %patch1 -p1
 
 %build
-cd neb
-%{__make}
+%{__make} -C neb
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{plugindir},%{moduledir}}
 install neb/inserter.o $RPM_BUILD_ROOT%{moduledir}
-rm -rf neb
 cp -a . $RPM_BUILD_ROOT%{plugindir}
+rm -rf $RPM_BUILD_ROOT%{plugindir}/neb
 
 # Edit nagios.cfg and set:
 #
@@ -78,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008/10/05 11:19:00  glen
+- re-entrant install
+
 Revision 1.15  2008/10/05 11:18:07  glen
 - simplify macros and cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-npc.spec?r1=1.15&r2=1.16&f=u