From 7d1adebf214f8282e2b920fd17e763efa4c62dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Fri, 14 Jan 2005 17:21:23 +0000
Subject: new files and fix paths

---
 Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 30c239c..3b11cde 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,12 @@ prefix		= /usr
 bindir		= $(prefix)/bin
 includedir	= $(prefix)/include
 
-BINARIES	= mkmultiarch multiarch-platform multiarch-dispatch
+RPM_MACRO_FILES	= macros.multiarch
+RPM_BIN_FILES	= mkmultiarch
+BINARIES	= multiarch-platform multiarch-dispatch
 INCLUDES	= multiarch-dispatch.h
 OTHER_FILES	= Makefile multiarch-utils.spec ChangeLog
-FILES		= $(BINARIES) $(INCLUDES) $(OTHER_FILES)
+FILES		= $(RPM_MACRO_FILES) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(OTHER_FILES)
 
 PACKAGE		= multiarch-utils
 VERSION		:= $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec)
@@ -29,10 +31,14 @@ clean: cleandist
 	rm -f *~
 
 install:
+	-mkdir -p $(DESTDIR)/etc/rpm
+	install -m644 $(RPM_MACRO_FILES) $(DESTDIR)/etc/rpm/
+	-mkdir -p $(DESTDIR)$(prefix)/lib/rpm
+	install -m755 $(RPM_BIN_FILES) $(DESTDIR)$(prefix)/lib/rpm/
 	-mkdir -p $(DESTDIR)$(bindir)
-	cp -p $(BINARIES) $(DESTDIR)$(bindir)
+	install -m755 $(BINARIES) $(DESTDIR)$(bindir)/
 	-mkdir -p $(DESTDIR)$(includedir)
-	cp -p $(INCLUDES) $(DESTDIR)$(includedir)
+	install -m644 $(INCLUDES) $(DESTDIR)$(includedir)/
 
 # rules to build a test rpm
 
-- 
cgit v1.2.1