File smp_utils-Makefile.diff of Package smp_utils

Index: smp_utils-0.93/Makefile
===================================================================
--- smp_utils-0.93.orig/Makefile
+++ smp_utils-0.93/Makefile
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 
-PREFIX=/usr/local
+PREFIX=/usr
 INSTDIR=$(DESTDIR)/$(PREFIX)/bin
 MANDIR=$(DESTDIR)/$(PREFIX)/share/man
 
 ifndef CC
@@ -26,10 +26,11 @@ LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE
 EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
 
 INCLUDES = -I include
 
-# CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+# CFLAGS = -O3 -Wall -W $(EXTRA_FLAGS)
+CFLAGS = $(RPM_OPT_FLAGS) -W $(EXTRA_FLAGS)
 # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
 
 CFLAGS_PTHREADS = -D_REENTRANT
 
@@ -118,13 +119,13 @@ smp_rep_exp_route_tbl: smp_rep_exp_route
 
 install: $(EXECS)
 	install -d $(INSTDIR)
 	for name in $^; \
-	 do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+	 do install -m 755 $$name $(INSTDIR); \
 	done
 	install -d $(MANDIR)/$(MAN_PREF)
 	for mp in $(MAN_PGS); \
-	 do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \
+	 do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \
 	 gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
 	done
 
 uninstall:
Index: smp_utils-0.93/mpt/Makefile
===================================================================
--- smp_utils-0.93.orig/mpt/Makefile
+++ smp_utils-0.93/mpt/Makefile
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 
-PREFIX=/usr/local
+PREFIX=/usr
 INSTDIR=$(DESTDIR)/$(PREFIX)/bin
 MANDIR=$(DESTDIR)/$(PREFIX)/share/man
 
 ifndef CC
@@ -16,10 +16,11 @@ LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE
 EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
 
 INCLUDES = -I ../include
 
+RPM_OPT_FLAGS = -g -O2 -Wall
 # CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
+CFLAGS = $(RPM_OPT_FLAGS) -W $(EXTRA_FLAGS)
 # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
 
 LDFLAGS = 
 # LDFLAGS = -v -lm
@@ -39,13 +40,13 @@ clean:
 
 install: $(EXECS)
 	install -d $(INSTDIR)
 	for name in $^; \
-	 do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+	 do install -m 755 $$name $(INSTDIR); \
 	done
 	install -d $(MANDIR)/$(MAN_PREF)
 	for mp in $(MAN_PGS); \
-	 do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+	 do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
 	 gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
 	done
 
 uninstall:
Index: smp_utils-0.93/sas_tpl/Makefile
===================================================================
--- smp_utils-0.93.orig/sas_tpl/Makefile
+++ smp_utils-0.93/sas_tpl/Makefile
@@ -15,9 +15,10 @@ OS_FLAGS = -DSMP_UTILS_LINUX
 LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
 
 # CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS) -W $(EXTRA_FLAGS)
 # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
 
 LDFLAGS = 
 # LDFLAGS = -v -lm
@@ -34,13 +35,13 @@ clean:
 
 install: $(EXECS)
 	install -d $(INSTDIR)
 	for name in $^; \
-	 do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+	 do install -m 755 $$name $(INSTDIR); \
 	done
 	install -d $(MANDIR)/$(MAN_PREF)
 	for mp in $(MAN_PGS); \
-	 do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+	 do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
 	 gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
 	done
 
 uninstall:
Index: smp_utils-0.93/sgv4/Makefile
===================================================================
--- smp_utils-0.93.orig/sgv4/Makefile
+++ smp_utils-0.93/sgv4/Makefile
@@ -1,9 +1,9 @@
 SHELL = /bin/sh
 KERNELRELEASE ?= $(shell uname -r)
 KSRC ?= /lib/modules/$(KERNELRELEASE)/build
 
-PREFIX=/usr/local
+PREFIX=/usr
 INSTDIR=$(DESTDIR)/$(PREFIX)/bin
 MANDIR=$(DESTDIR)/$(PREFIX)/share/man
 
 ifndef CC
@@ -19,9 +19,10 @@ EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_F
 
 INCLUDES = -I ../include -I $(KSRC)/include -idirafter ../include/dummy
 
 # CFLAGS =  -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS) -W $(EXTRA_FLAGS)
 # CFLAGS = -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
 
 LDFLAGS = 
 # LDFLAGS = -v -lm
@@ -41,13 +42,13 @@ clean:
 
 install: $(EXECS)
 	install -d $(INSTDIR)
 	for name in $^; \
-	 do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+	 do install -m 755 $$name $(INSTDIR); \
 	done
 	install -d $(MANDIR)/$(MAN_PREF)
 	for mp in $(MAN_PGS); \
-	 do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+	 do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
 	 gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
 	done
 
 uninstall: