--- trunk/mkinitrd-magellan/grubby/Makefile	2009/10/28 00:26:22	917
+++ trunk/grubby/Makefile	2012/02/17 23:23:07	1694
@@ -17,19 +17,27 @@
 # 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
 
-CFLAGS := $(CFLAGS) $(RPM_OPT_FLAGS) -DVERSION='"$(VERSION)"' -Wall -Werror
+CC = gcc
+CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function
 LDFLAGS := 
 
 grubby_LIBS = -lblkid -lpopt
-grubby_LIBS += $(shell pkg-config --libs glib-2.0)
+
+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
@@ -38,6 +46,9 @@
 	mkdir -p $(DESTDIR)/sbin
 	mkdir -p $(DESTDIR)/$(mandir)/man8
 	install -m 755 new-kernel-pkg $(DESTDIR)/sbin
+	install -m 644 new-kernel-pkg.8 $(DESTDIR)/$(mandir)/man8
+	install -m 755 installkernel $(DESTDIR)/sbin
+	install -m 644 installkernel.8 $(DESTDIR)/$(mandir)/man8
 	if [ -f grubby ]; then \
 		install -m 755 grubby $(DESTDIR)/sbin ; \
 		install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \