DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer install to $(INCLUDEDIR)/System as it breaks some system includes

Browse Source
This commit is contained in:
Pierre Pronchery 2012-10-17 10:44:59 +00:00
parent efe9b9e2eb
commit 2008451a03
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/libApp.pc.in
View File

@ -1,5 +1,5 @@
prefix=@PREFIX@ prefix=@PREFIX@
includedir=${prefix}/include/System includedir=${prefix}/include
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib

30
include/App/Makefile
View File

@ -14,22 +14,22 @@ clean:
distclean: clean distclean: clean
install: install:
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
$(INSTALL) -m 0644 -- app.h $(DESTDIR)$(INCLUDEDIR)/System/App/app.h $(INSTALL) -m 0644 -- app.h $(DESTDIR)$(INCLUDEDIR)/App/app.h
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
$(INSTALL) -m 0644 -- appclient.h $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h $(INSTALL) -m 0644 -- appclient.h $(DESTDIR)$(INCLUDEDIR)/App/appclient.h
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
$(INSTALL) -m 0644 -- appmessage.h $(DESTDIR)$(INCLUDEDIR)/System/App/appmessage.h $(INSTALL) -m 0644 -- appmessage.h $(DESTDIR)$(INCLUDEDIR)/App/appmessage.h
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
$(INSTALL) -m 0644 -- appserver.h $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h $(INSTALL) -m 0644 -- appserver.h $(DESTDIR)$(INCLUDEDIR)/App/appserver.h
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System/App $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/App
$(INSTALL) -m 0644 -- apptransport.h $(DESTDIR)$(INCLUDEDIR)/System/App/apptransport.h $(INSTALL) -m 0644 -- apptransport.h $(DESTDIR)$(INCLUDEDIR)/App/apptransport.h
uninstall: uninstall:
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/app.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/app.h
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appclient.h
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appmessage.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appmessage.h
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/appserver.h
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/apptransport.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App/apptransport.h
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall

10
include/App/project.conf
View File

@ -2,16 +2,16 @@ includes=app.h,appclient.h,appmessage.h,appserver.h,apptransport.h
dist=Makefile dist=Makefile
[app.h] [app.h]
install=$(INCLUDEDIR)/System/App install=$(INCLUDEDIR)/App
[appclient.h] [appclient.h]
install=$(INCLUDEDIR)/System/App install=$(INCLUDEDIR)/App
[appmessage.h] [appmessage.h]
install=$(INCLUDEDIR)/System/App install=$(INCLUDEDIR)/App
[appserver.h] [appserver.h]
install=$(INCLUDEDIR)/System/App install=$(INCLUDEDIR)/App
[apptransport.h] [apptransport.h]
install=$(INCLUDEDIR)/System/App install=$(INCLUDEDIR)/App

6
include/Makefile
View File

@ -21,11 +21,11 @@ distclean:
install: install:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System $(MKDIR) $(DESTDIR)$(INCLUDEDIR)
$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h $(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/App.h
uninstall: uninstall:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done @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 .PHONY: all subdirs clean distclean install uninstall

2
include/project.conf
View File

@ -3,4 +3,4 @@ includes=App.h
dist=Makefile dist=Makefile
[App.h] [App.h]
install=$(INCLUDEDIR)/System install=$(INCLUDEDIR)

2
src/transport/Makefile
View File

@ -1,5 +1,5 @@
TARGETS = tcp.so udp.so TARGETS = tcp.so udp.so
PREFIX = /usr PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
CC ?= cc CC ?= cc