gfs1-utils: master - gfs: fsck and mkfs binaries should be in /sbin

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=120b507e1528d081f9a496b15b3070f00c294ee8
Commit:        120b507e1528d081f9a496b15b3070f00c294ee8
Parent:        e5c5f327beffcb6f24ca42794bb2c019ce5590ee
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Mon May 4 09:42:19 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon May 4 09:44:53 2009 +0200

gfs: fsck and mkfs binaries should be in /sbin

also cleanup the Makefiles and remove more obsolted compat
symlinks.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 gfs/gfs_fsck/Makefile |   12 ++++++------
 gfs/gfs_mkfs/Makefile |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gfs/gfs_fsck/Makefile b/gfs/gfs_fsck/Makefile
index af7637d..c0e5938 100644
--- a/gfs/gfs_fsck/Makefile
+++ b/gfs/gfs_fsck/Makefile
@@ -1,8 +1,8 @@
-TARGET1= fsck.gfs
+TARGET= fsck.gfs
 
-SBINDIRT=$(TARGET1)
+FORCESBINT= $(TARGET)
 
-all: ${TARGET1}
+all: ${TARGET}
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
@@ -47,7 +47,7 @@ CFLAGS += -I${incdir}
 
 LDFLAGS += -L${libdir}
 
-${TARGET1}: $(OBJS)
+${TARGET}: $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 test_block_list: block_list.o bitmap.o log.o test_block_list.o
@@ -59,9 +59,9 @@ test_bitmap: bitmap.o test_bitmap.o log.o
 clean: generalclean
 	rm -f test_block_list test_bitmap
 
-${TARGET1}.pot: $(OBJS:.o=.c)
+${TARGET}.pot: $(OBJS:.o=.c)
 	xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \
 	 --keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit \
-	 --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot
+	 --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET}.pot
 
 -include $(OBJS:.o=.d)
diff --git a/gfs/gfs_mkfs/Makefile b/gfs/gfs_mkfs/Makefile
index 39d53a7..165644b 100644
--- a/gfs/gfs_mkfs/Makefile
+++ b/gfs/gfs_mkfs/Makefile
@@ -1,8 +1,8 @@
-TARGET1= mkfs.gfs
+TARGET= mkfs.gfs
 
-SBINDIRT=$(TARGET1)
+FORCESBINT= $(TARGET)
 
-all: depends ${TARGET1}
+all: depends ${TARGET}
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
@@ -28,7 +28,7 @@ LDFLAGS += -L${libdir}
 
 LDDEPS += ../libgfs/libgfs.a
 
-${TARGET1}: ${OBJS} ${LDDEPS}
+${TARGET}: ${OBJS} ${LDDEPS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 depends: