File smp_utils-Makefile.diff of Package smp_utils

Index: smp_utils-0.94/Makefile
===================================================================
--- smp_utils-0.94.orig/Makefile
+++ smp_utils-0.94/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 
-PREFIX=/usr/local
+PREFIX=/usr
 INSTDIR=$(DESTDIR)/$(PREFIX)/bin
 MANDIR=$(DESTDIR)/$(PREFIX)/share/man
 
@@ -28,8 +28,7 @@ EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_F
 INCLUDES = -I include
 
 # may be overridden by 'make -e'
-CFLAGS = -g -O2
-
+CFLAGS = $(RPM_OPT_FLAGS)
 # MY_CFLAGS = -Wall -W $(EXTRA_FLAGS)
 MY_CFLAGS = -Wall -W $(EXTRA_FLAGS)
 # MY_CFLAGS = -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
@@ -122,11 +121,11 @@ 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
 
Index: smp_utils-0.94/mpt/Makefile
===================================================================
--- smp_utils-0.94.orig/mpt/Makefile
+++ smp_utils-0.94/mpt/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 
-PREFIX=/usr/local
+PREFIX=/usr
 INSTDIR=$(DESTDIR)/$(PREFIX)/bin
 MANDIR=$(DESTDIR)/$(PREFIX)/share/man
 
@@ -17,8 +17,9 @@ EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_F
 
 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 = 
@@ -40,11 +41,11 @@ 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
 
Index: smp_utils-0.94/sas_tpl/Makefile
===================================================================
--- smp_utils-0.94.orig/sas_tpl/Makefile
+++ smp_utils-0.94/sas_tpl/Makefile
@@ -16,7 +16,8 @@ LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE
 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 = 
@@ -35,11 +36,11 @@ 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
 
Index: smp_utils-0.94/sgv4/Makefile
===================================================================
--- smp_utils-0.94.orig/sgv4/Makefile
+++ smp_utils-0.94/sgv4/Makefile
@@ -2,7 +2,7 @@ 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
 
@@ -21,7 +21,8 @@ INCLUDES = -I ../include -I $(KSRC)/incl
 # INCLUDES = -I ../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 = 
@@ -43,11 +44,11 @@ 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