The branch, master has been updated
via 2cdcd7006394cab5b0a0d73416d0502c2a691012 (commit)
from fa72af6bf8a9f4b9e52e637fe37e0ace61620613 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2cdcd7006394cab5b0a0d73416d0502c2a691012
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 11 09:21:04 2013 +0100
more work on Makefiles
-----------------------------------------------------------------------
Summary of changes:
x2goadmincenter/Makefile | 32 +++++++++++++-------------------
x2goadminserver/Makefile | 16 ++++++++--------
2 files changed, 21 insertions(+), 27 deletions(-)
The diff of changes is:
diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile
index 895328a..1f30a43 100755
--- a/x2goadmincenter/Makefile
+++ b/x2goadmincenter/Makefile
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-BUILD_DIR=.build
+BUILD_DIR=$(CURDIR)/.build
BUILD_BINARY=$(BUILD_DIR)/x2goadmincenter
-PLUGINS_DIR=plugins
+PLUGINS_DIR=$(CURDIR)/plugins
SHELL=/bin/bash
@@ -37,7 +37,7 @@ build_admincenter:
cd $(BUILD_DIR) && $(MAKE)
build_plugins:
- for module in `ls modules`; do cd modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done
+ for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) $$module.pro && make && cd - 1>/dev/null; done
build_man:
$(MAKE) -f Makefile.man2html build
@@ -54,6 +54,7 @@ clean_admincenter:
rm -fr $(BUILD_DIR)
clean_plugins:
+ for module in `ls $(CURDIR)/modules`; do rm -fv $(CURDIR)/modules/$$module/Makefile; done
rm -fr $(PLUGINS_DIR)/*
clean_man:
@@ -65,19 +66,19 @@ install_admincenter:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
$(INSTALL_PROGRAM) $(BUILD_BINARY) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications/
- $(INSTALL_FILE) desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop
+ $(INSTALL_FILE) $(CURDIR)/desktop/x2goadmincenter.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/
- $(INSTALL_FILE) icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
+ $(INSTALL_FILE) $(CURDIR)/icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/
- $(INSTALL_FILE) icons/128x128/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png
+ $(INSTALL_FILE) $(CURDIR)/icons/128x128/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/
- $(INSTALL_FILE) icons/16x16/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png
+ $(INSTALL_FILE) $(CURDIR)/icons/16x16/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/
- $(INSTALL_FILE) icons/32x32/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png
+ $(INSTALL_FILE) $(CURDIR)/icons/32x32/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/
- $(INSTALL_FILE) icons/48x48/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png
+ $(INSTALL_FILE) $(CURDIR)/icons/48x48/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/
- $(INSTALL_FILE) icons/64x64/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png
+ $(INSTALL_FILE) $(CURDIR)/icons/64x64/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png
install_plugins:
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/plugins/
@@ -86,7 +87,7 @@ install_plugins:
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
- $(INSTALL_FILE) man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8
+ $(INSTALL_FILE) $(CURDIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8
gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8
uninstall: uninstall_admincenter uninstall_plugins uninstall_man
@@ -95,29 +96,22 @@ uninstall_admincenter:
$(RM_FILE) $(BINDIR)/x2goadmincenter
$(RM_FILE) $(SHAREDIR)/applications/x2goadmincenter.desktop
$(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
+ $(RM_DIR) $(SHAREDIR)/applications/
$(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons
$(RM_FILE) $(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png
$(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/apps/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/
$(RM_FILE) $(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png
$(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/apps/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/
$(RM_FILE) $(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png
$(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/
$(RM_FILE) $(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png
$(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/apps/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/
$(RM_FILE) $(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png
$(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/
- $(RM_DIR) $(SHAREDIR)/icons/
uninstall_plugins:
$(RM_FILE) $(LIBDIR)/plugins/*
$(RM_DIR) $(LIBDIR)/plugins/
- $(RM_DIR) $(LIBDIR)/
uninstall_man:
$(RM_FILE) $(MANDIR)/man8/x2goadmincenter.8.gz
diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile
index c8ae08e..d785a7b 100755
--- a/x2goadminserver/Makefile
+++ b/x2goadminserver/Makefile
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-SRC_DIR=$(CURDIR)
-
SHELL=/bin/bash
INSTALL_DIR=install -d -o root -g root -m 755
@@ -41,20 +39,21 @@ install_adminserver:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/
- $(INSTALL_FILE) $(SRC_DIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/
- $(INSTALL_FILE) $(SRC_DIR)/lib/* $(DESTDIR)$(LIBDIR)/
- $(INSTALL_FILE) $(SRC_DIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin
+ $(INSTALL_FILE) $(CURDIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/
+ $(INSTALL_FILE) $(CURDIR)/lib/* $(DESTDIR)$(LIBDIR)/
+ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/lib/cgi-bin
+ $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
- $(INSTALL_FILE) $(SRC_DIR)/man/man5/*.5 $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL_FILE) $(CURDIR)/man/man5/*.5 $(DESTDIR)$(MANDIR)/man5
gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
- $(INSTALL_FILE) $(SRC_DIR)/man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) $(CURDIR)/man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
-uninstall: uninstall_adminserver
+uninstall: uninstall_adminserver uninstall_man
uninstall_adminserver:
$(RM_FILE) $(ETCDIR)/x2goadminserver.conf
@@ -63,6 +62,7 @@ uninstall_adminserver:
$(RM_FILE) $(LIBDIR)/x2goadminserver_backend_*.pm
$(RM_DIR) $(ETCDIR)/
$(RM_DIR) $(LIBDIR)/
+ $(RM_DIR) $(PREFIX)/lib/cgi-bin/
uninstall_man:
$(RM_FILE) $(DESTDIR)$(MANDIR)/man5/x2goadminserver.conf.5.gz
hooks/post-receive
--
x2goadmincenter.git (X2Go Administration Center)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goadmincenter.git" (X2Go Administration Center).