From 2008451a0392181997341d55b591052bb075aeef Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 17 Oct 2012 10:44:59 +0000
Subject: [PATCH] No longer install to $(INCLUDEDIR)/System as it breaks some
 system includes

---
 data/libApp.pc.in        |  2 +-
 include/App/Makefile     | 30 +++++++++++++++---------------
 include/App/project.conf | 10 +++++-----
 include/Makefile         |  6 +++---
 include/project.conf     |  2 +-
 src/transport/Makefile   |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/libApp.pc.in b/data/libApp.pc.in
index 7fb1f3a..4e0b8b9 100644
--- a/data/libApp.pc.in
+++ b/data/libApp.pc.in
@@ -1,5 +1,5 @@
 prefix=@PREFIX@
-includedir=${prefix}/include/System
+includedir=${prefix}/include
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 
diff --git a/include/App/Makefile b/include/App/Makefile
index 0d13479..f8563b7 100644
--- a/include/App/Makefile
+++ b/include/App/Makefile
@@ -14,22 +14,22 @@ clean:
 distclean: clean
 
 install:
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App
-	$(INSTALL) -m 0644 -- app.h $(DESTDIR)$(INCLUDEDIR)/System/App/app.h
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App
-	$(INSTALL) -m 0644 -- appclient.h $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App
-	$(INSTALL) -m 0644 -- appmessage.h $(DESTDIR)$(INCLUDEDIR)/System/App/appmessage.h
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App
-	$(INSTALL) -m 0644 -- appserver.h $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h
-	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App
-	$(INSTALL) -m 0644 -- apptransport.h $(DESTDIR)$(INCLUDEDIR)/System/App/apptransport.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
+	$(INSTALL) -m 0644 -- app.h $(DESTDIR)$(INCLUDEDIR)/App/app.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
+	$(INSTALL) -m 0644 -- appclient.h $(DESTDIR)$(INCLUDEDIR)/App/appclient.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
+	$(INSTALL) -m 0644 -- appmessage.h $(DESTDIR)$(INCLUDEDIR)/App/appmessage.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
+	$(INSTALL) -m 0644 -- appserver.h $(DESTDIR)$(INCLUDEDIR)/App/appserver.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
+	$(INSTALL) -m 0644 -- apptransport.h $(DESTDIR)$(INCLUDEDIR)/App/apptransport.h
 
 uninstall:
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/app.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appmessage.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/apptransport.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/app.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appclient.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appmessage.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appserver.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/apptransport.h
 
 .PHONY: all clean distclean install uninstall
diff --git a/include/App/project.conf b/include/App/project.conf
index 786f9a6..3696399 100644
--- a/include/App/project.conf
+++ b/include/App/project.conf
@@ -2,16 +2,16 @@ includes=app.h,appclient.h,appmessage.h,appserver.h,apptransport.h
 dist=Makefile
 
 [app.h]
-install=$(INCLUDEDIR)/System/App
+install=$(INCLUDEDIR)/App
 
 [appclient.h]
-install=$(INCLUDEDIR)/System/App
+install=$(INCLUDEDIR)/App
 
 [appmessage.h]
-install=$(INCLUDEDIR)/System/App
+install=$(INCLUDEDIR)/App
 
 [appserver.h]
-install=$(INCLUDEDIR)/System/App
+install=$(INCLUDEDIR)/App
 
 [apptransport.h]
-install=$(INCLUDEDIR)/System/App
+install=$(INCLUDEDIR)/App
diff --git a/include/Makefile b/include/Makefile
index 0bf7dd3..3960326 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)$(INCLUDEDIR)/System
-	$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h
+	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/App.h
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/App.h
 
 .PHONY: all subdirs clean distclean install uninstall
diff --git a/include/project.conf b/include/project.conf
index 577cbf9..0113947 100644
--- a/include/project.conf
+++ b/include/project.conf
@@ -3,4 +3,4 @@ includes=App.h
 dist=Makefile
 
 [App.h]
-install=$(INCLUDEDIR)/System
+install=$(INCLUDEDIR)
diff --git a/src/transport/Makefile b/src/transport/Makefile
index 94dda6f..4ac8774 100644
--- a/src/transport/Makefile
+++ b/src/transport/Makefile
@@ -1,5 +1,5 @@
 TARGETS	= tcp.so udp.so
-PREFIX	= /usr
+PREFIX	= /usr/local
 DESTDIR	=
 LIBDIR	= $(PREFIX)/lib
 CC	?= cc