--- trunk/grubby/Makefile	2011/06/03 20:32:19	1332
+++ trunk/grubby/Makefile	2013/10/21 14:04:39	2261
@@ -17,31 +17,42 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION=$(shell cat ../VERSION)
+VERSION=$(shell cat VERSION)
 
 TARGETS = grubby
-OBJECTS = grubby.o
+OBJECTS = grubby.o log.o
 
-CFLAGS := $(CFLAGS) $(RPM_OPT_FLAGS) -DVERSION='"$(VERSION)"' -Wall -Werror
+CC = gcc
+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
+sbindir = /usr/sbin
+mandir = /usr/share/man
 
 all: grubby
 
+debug : clean
+	$(MAKE) CFLAGS="${CFLAGS} -DDEBUG=1" all
+
+%.o : %.c
+	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c -o $@ $<
+
 test: all
 	@export TOPDIR=$(TOPDIR)
 	@./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)/$(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