From ffb79d64754635419b79abffb5c4d8e367f36aff Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 30 Nov 2012 23:33:42 +0100
Subject: [PATCH] Code cleanup

---
 include/Asm/Makefile     | 30 +++++++++++++++---------------
 include/Asm/project.conf | 10 +++++-----
 include/Makefile         |  6 +++---
 include/project.conf     |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/include/Asm/Makefile b/include/Asm/Makefile
index 76cb295..fb55ff3 100644
--- a/include/Asm/Makefile
+++ b/include/Asm/Makefile
@@ -14,22 +14,22 @@ clean:
 distclean: clean
 
 install:
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel/Asm
-	$(INSTALL) -m 0644 -- arch.h $(DESTDIR)$(PREFIX)/include/Devel/Asm/arch.h
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel/Asm
-	$(INSTALL) -m 0644 -- asm.h $(DESTDIR)$(PREFIX)/include/Devel/Asm/asm.h
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel/Asm
-	$(INSTALL) -m 0644 -- code.h $(DESTDIR)$(PREFIX)/include/Devel/Asm/code.h
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel/Asm
-	$(INSTALL) -m 0644 -- common.h $(DESTDIR)$(PREFIX)/include/Devel/Asm/common.h
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel/Asm
-	$(INSTALL) -m 0644 -- format.h $(DESTDIR)$(PREFIX)/include/Devel/Asm/format.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel/Asm
+	$(INSTALL) -m 0644 -- arch.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/arch.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel/Asm
+	$(INSTALL) -m 0644 -- asm.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/asm.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel/Asm
+	$(INSTALL) -m 0644 -- code.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/code.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel/Asm
+	$(INSTALL) -m 0644 -- common.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/common.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel/Asm
+	$(INSTALL) -m 0644 -- format.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/format.h
 
 uninstall:
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm/arch.h
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm/asm.h
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm/code.h
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm/common.h
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm/format.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/arch.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/asm.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/code.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/common.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm/format.h
 
 .PHONY: all clean distclean install uninstall
diff --git a/include/Asm/project.conf b/include/Asm/project.conf
index 5677345..cf98011 100644
--- a/include/Asm/project.conf
+++ b/include/Asm/project.conf
@@ -2,16 +2,16 @@ includes=arch.h,asm.h,code.h,common.h,format.h
 dist=Makefile
 
 [arch.h]
-install=$(PREFIX)/include/Devel/Asm
+install=$(INCLUDEDIR)/Devel/Asm
 
 [asm.h]
-install=$(PREFIX)/include/Devel/Asm
+install=$(INCLUDEDIR)/Devel/Asm
 
 [code.h]
-install=$(PREFIX)/include/Devel/Asm
+install=$(INCLUDEDIR)/Devel/Asm
 
 [common.h]
-install=$(PREFIX)/include/Devel/Asm
+install=$(INCLUDEDIR)/Devel/Asm
 
 [format.h]
-install=$(PREFIX)/include/Devel/Asm
+install=$(INCLUDEDIR)/Devel/Asm
diff --git a/include/Makefile b/include/Makefile
index 1ad3dc1..ea4424e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -21,11 +21,11 @@ distclean:
 
 install:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
-	$(MKDIR) $(DESTDIR)$(PREFIX)/include/Devel
-	$(INSTALL) -m 0644 -- Asm.h $(DESTDIR)$(PREFIX)/include/Devel/Asm.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel
+	$(INSTALL) -m 0644 -- Asm.h $(DESTDIR)$(INCLUDEDIR)/Devel/Asm.h
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) -- $(DESTDIR)$(PREFIX)/include/Devel/Asm.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/Asm.h
 
 .PHONY: all subdirs clean distclean install uninstall
diff --git a/include/project.conf b/include/project.conf
index be73f54..ce4facc 100644
--- a/include/project.conf
+++ b/include/project.conf
@@ -3,4 +3,4 @@ includes=Asm.h
 dist=Makefile
 
 [Asm.h]
-install=$(PREFIX)/include/Devel
+install=$(INCLUDEDIR)/Devel