diff --git a/include/App/Makefile b/include/App/Makefile index f8563b7..0d13479 100644 --- a/include/App/Makefile +++ b/include/App/Makefile @@ -14,22 +14,22 @@ clean: distclean: clean install: - $(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 + $(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 uninstall: - $(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 + $(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 .PHONY: all clean distclean install uninstall diff --git a/include/App/project.conf b/include/App/project.conf index 3696399..786f9a6 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)/App +install=$(INCLUDEDIR)/System/App [appclient.h] -install=$(INCLUDEDIR)/App +install=$(INCLUDEDIR)/System/App [appmessage.h] -install=$(INCLUDEDIR)/App +install=$(INCLUDEDIR)/System/App [appserver.h] -install=$(INCLUDEDIR)/App +install=$(INCLUDEDIR)/System/App [apptransport.h] -install=$(INCLUDEDIR)/App +install=$(INCLUDEDIR)/System/App diff --git a/include/Makefile b/include/Makefile index 3960326..0bf7dd3 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) - $(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/App.h + $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System + $(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h uninstall: @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done - $(RM) -- $(DESTDIR)$(INCLUDEDIR)/App.h + $(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App.h .PHONY: all subdirs clean distclean install uninstall diff --git a/include/project.conf b/include/project.conf index 0113947..577cbf9 100644 --- a/include/project.conf +++ b/include/project.conf @@ -3,4 +3,4 @@ includes=App.h dist=Makefile [App.h] -install=$(INCLUDEDIR) +install=$(INCLUDEDIR)/System