From 7b0ad787d6fb0e967e4ee938fffaf804cf433588 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 19 Sep 2007 20:13:08 +0000
Subject: - fixes and cleanups (Cristian Ionescu-Idbohrn)

---
 package/liblockfile/liblockfile.mk | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'package/liblockfile')

diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 959c21887..7519e62e2 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -28,29 +28,38 @@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--libdir=/usr/lib \
+		--includedir=/usr/include \
+		--mandir=/usr/share/man \
 		--enable-shared \
 	)
 	touch $@
 
 $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured
-	mkdir -p $(STAGING_DIR)/man/man1 $(STAGING_DIR)/man/man3
-	$(MAKE) -C $(LIBLOCKFILE_DIR) prefix= ROOT=$(STAGING_DIR) install
-	ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/lib/liblockfile.so.1
-	cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib
+	mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
+	mkdir -p $(STAGING_DIR)/usr/share/man/man3
+	rm -f $(STAGING_DIR)/usr/lib/liblockfile.so
+	$(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install
+	ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/usr/lib/liblockfile.so.1
+	cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/usr/lib
 
 $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY)
 	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -a $(STAGING_DIR)/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
-	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
+	cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
+	$(STRIP) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
 
 liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
 
 liblockfile-clean:
 	rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
-	rm -f $(STAGING_DIR)/lib/liblockfile*
-	rm -f $(STAGING_DIR)/usr/include/lockfile.h
-	rm -f $(STAGING_DIR)/usr/include/mailfile.h
-	rm -rf $(STAGING_DIR)/man
+	rm -f $(STAGING_DIR)/usr/lib/liblockfile*
+	rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	rm -rf $(STAGING_DIR)/usr/share/man
+endif
 	$(MAKE) -C $(LIBLOCKFILE_DIR) clean
 
 liblockfile-dirclean:
-- 
cgit v1.2.3