--- trunk/grubby/Makefile 2012/07/02 13:20:31 1864 +++ trunk/grubby/Makefile 2013/10/21 13:19:07 2236 @@ -20,7 +20,7 @@ VERSION=$(shell cat VERSION) TARGETS = grubby -OBJECTS = grubby.o +OBJECTS = grubby.o log.o CC = gcc RPM_OPT_FLAGS := -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector @@ -29,7 +29,8 @@ grubby_LIBS = -lblkid -lpopt -mandir = usr/share/man +sbindir = /usr/sbin +mandir = /usr/share/man all: grubby @@ -44,14 +45,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