--- trunk/grubby/Makefile	2012/02/17 23:23:07	1694
+++ tags/grubby-8_35/Makefile	2014/07/16 11:00:50	2717
@@ -20,15 +20,18 @@
 VERSION=$(shell cat VERSION)
 
 TARGETS = grubby
-OBJECTS = grubby.o
+OBJECTS = grubby.o log.o
 
 CC = gcc
-CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function
+RPM_OPT_FLAGS ?= -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector
+CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function -ggdb
 LDFLAGS := 
 
 grubby_LIBS = -lblkid -lpopt
 
-mandir = usr/share/man
+PREFIX = /usr
+sbindir = $(PREFIX)/sbin
+mandir = /usr/share/man
 
 all: grubby
 
@@ -43,14 +46,14 @@
 	@./test.sh
 
 install: all
-	mkdir -p $(DESTDIR)/sbin
+	mkdir -p $(DESTDIR)/$(sbindir)
 	mkdir -p $(DESTDIR)/$(mandir)/man8
-	install -m 755 new-kernel-pkg $(DESTDIR)/sbin
+	install -m 755 new-kernel-pkg $(DESTDIR)/$(sbindir)
 	install -m 644 new-kernel-pkg.8 $(DESTDIR)/$(mandir)/man8
-	install -m 755 installkernel $(DESTDIR)/sbin
+	install -m 755 installkernel $(DESTDIR)/$(sbindir)
 	install -m 644 installkernel.8 $(DESTDIR)/$(mandir)/man8
 	if [ -f grubby ]; then \
-		install -m 755 grubby $(DESTDIR)/sbin ; \
+		install -m 755 grubby $(DESTDIR)/$(sbindir) ; \
 		install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \
 	fi