use relative paths for submodules

diff --git a/.gitmodules b/.gitmodules
index 6707680da7efad3b43512cbf4a1d765e3eb67e04..aca2f6722a39ea754ece0acb69a4833e379de318 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
-[submodule "proxmox-mailgateway-gui"]
-       path = proxmox-mailgateway-gui
-       url = ssh://gitolite3@proxdev.maurer-it.com/pmg/proxmox-mailgateway-gui
+[submodule "pmg-gui"]
+       path = pmg-gui
+       url = ../pmg-gui/
 
 [submodule "proxmox-widget-toolkit"]
        path = proxmox-widget-toolkit
-       url = ssh://gitolite3@proxdev.maurer-it.com/pve/proxmox-widget-toolkit
+       url = ../proxmox-widget-toolkit/
 
 [submodule "pve-manager"]
        path = pve-manager
-       url = ssh://gitolite3@proxdev.maurer-it.com/pve/pve-manager
+       url = ../pve-manager/

diff --git a/Makefile b/Makefile
index 35bb54298d6680f72b8b1d0bed09efce22546418..4f8bbb52824398c34a005f70800d812f18b11443 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ $(DEBS): | submodule
 
 .PHONY: submodule
 submodule:
-       test -f "proxmox-mailgateway-gui/Makefile" || git submodule update --init
+       test -f "pmg-gui/Makefile" || git submodule update --init
 
 .PHONY: install
 install: ${PMG_LANG_FILES} ${PVE_LANG_FILES} 
@@ -48,7 +48,7 @@ pve-lang-%.js: proxmox-widget-toolkit-%.po pve-manager-%.po
 .PHONY: update
 update:
        ./jsgettext.pl -p "proxmox-widget-toolkit 1.0" -o proxmox-widget-toolkit.pot proxmox-widget-toolkit/ 
-       ./jsgettext.pl -p "proxmox-mailgateway 5.0" -o proxmox-mailgateway.pot -b proxmox-widget-toolkit.pot proxmox-mailgateway-gui/js/
+       ./jsgettext.pl -p "proxmox-mailgateway 5.0" -o proxmox-mailgateway.pot -b proxmox-widget-toolkit.pot pmg-gui/js/
        ./jsgettext.pl -p "pve-manager 5.0" -o pve-manager.pot -b proxmox-widget-toolkit.pot pve-manager/www/manager6/
        for j in proxmox-widget-toolkit proxmox-mailgateway pve-manager; do for i in $(LINGUAS); do echo -n "$$j-$$i: ";msgmerge -s -v $$j-$$i.po $$j.pot >$$j-$$i.po.tmp && mv $$j-$$i.po.tmp $$j-$$i.po; done; done
 

diff --git a/pmg-gui b/pmg-gui
new file mode 160000 (submodule)
index 0000000..07f1416
--- /dev/null
+++ b/pmg-gui
@@ -0,0 +1 @@
+Subproject commit 07f1416a4c3b04e951764c36379ede1a811b10ca

diff --git a/proxmox-mailgateway-gui b/proxmox-mailgateway-gui
deleted file mode 160000 (submodule)
index 9584871..0000000
--- a/proxmox-mailgateway-gui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9584871dc765cbfeaddb8e1a557394534c476006

diff --git a/proxmox-widget-toolkit b/proxmox-widget-toolkit
index ca31548b042feadb449337eb10d75f3b7020a7a4..6689e1cedd032f2aeab4e939c806f55c6a3a5497 160000 (submodule)
--- a/proxmox-widget-toolkit
+++ b/proxmox-widget-toolkit
@@ -1 +1 @@
-Subproject commit ca31548b042feadb449337eb10d75f3b7020a7a4
+Subproject commit 6689e1cedd032f2aeab4e939c806f55c6a3a5497

diff --git a/pve-manager b/pve-manager
index 0557c80859f76c31978e170ef35ad0e03fa9a7bf..c6f0412f7a1e6141d4524db63e50ccabc72ed5a3 160000 (submodule)
--- a/pve-manager
+++ b/pve-manager
@@ -1 +1 @@
-Subproject commit 0557c80859f76c31978e170ef35ad0e03fa9a7bf
+Subproject commit c6f0412f7a1e6141d4524db63e50ccabc72ed5a3