[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-513-gf399bff

[Francesco Pipita]

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 "GNU MyServer".

The branch, master has been updated
       via  f399bffa3df2df71969926c8480c3b86475454bf (commit)
      from  f17ef0893bb9caede5103e0e03a0d82870bdb191 (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 f399bffa3df2df71969926c8480c3b86475454bf
Author: Francesco Pipita <address@hidden>
Date:   Thu Aug 18 00:59:11 2011 +0200

    Made the behavior of the make install a bit cleaner.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index b0da4f7..a0e97db 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 SUBDIRS = logs system web certificates plugins
 
-EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
-                                                virtualhosts.default.xml
+examplesdir = $(docdir)/examples
 
-configdir = $(DESTDIR)$(prefix)/etc/myserver
+dist_examples_DATA = myserver-daemon MIMEtypes.default.xml 
myserver.default.xml \
+                       virtualhosts.default.xml
diff --git a/myserver/binaries/certificates/Makefile.am 
b/myserver/binaries/certificates/Makefile.am
index 3f232a1..416945f 100644
--- a/myserver/binaries/certificates/Makefile.am
+++ b/myserver/binaries/certificates/Makefile.am
@@ -15,7 +15,4 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = how_create_certificates.txt
-install :
-       $(INSTALL) -d '$(DESTDIR)$(prefix)/etc/myserver/certificates'
-
+dist_doc_DATA = how_create_certificates.txt
diff --git a/myserver/binaries/logs/Makefile.am 
b/myserver/binaries/logs/Makefile.am
index 611fa7d..60ba11f 100644
--- a/myserver/binaries/logs/Makefile.am
+++ b/myserver/binaries/logs/Makefile.am
@@ -16,4 +16,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 install :
-       $(INSTALL) -d $(DESTDIR)$(prefix)/var/log/myserver
+       $(INSTALL) -d $(DESTDIR)$(localstatedir)/log/myserver
diff --git a/myserver/binaries/plugins/Makefile.am 
b/myserver/binaries/plugins/Makefile.am
index 5be8c16..b130abb 100644
--- a/myserver/binaries/plugins/Makefile.am
+++ b/myserver/binaries/plugins/Makefile.am
@@ -16,4 +16,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 install:
-       $(INSTALL) -d '$(DESTDIR)$(prefix)/lib/myserver/plugins'
+       $(INSTALL) -d '$(DESTDIR)$(pkglibdir)/plugins'
diff --git a/myserver/binaries/system/Makefile.am 
b/myserver/binaries/system/Makefile.am
index aae5a92..f349827 100644
--- a/myserver/binaries/system/Makefile.am
+++ b/myserver/binaries/system/Makefile.am
@@ -16,7 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 SUBDIRS = errors icons css
-myserverdatadir = $(datadir)/myserver/system
+myserverdatadir = $(docdir)/examples
 
 dist_myserverdata_DATA = .security.xml
 
+install-data-hook:
+       mv $(DESTDIR)$(docdir)/examples/.security.xml 
$(DESTDIR)$(docdir)/examples/security.default.xml
diff --git a/myserver/binaries/web/Makefile.am 
b/myserver/binaries/web/Makefile.am
index 3560a60..3369a3a 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -21,6 +21,6 @@ endif
 
 SUBDIRS = cgi-bin $(CGI_SRC)
 
-myserverdatadir = $(prefix)/var/web
+defaultsitedir = $(pkgdatadir)/web
 
-dist_myserverdata_DATA = logo.png goto.png default.html link.html
+dist_defaultsite_DATA = logo.png goto.png default.html link.html
diff --git a/myserver/binaries/web/cgi-bin/Makefile.am 
b/myserver/binaries/web/cgi-bin/Makefile.am
index 427217a..566db48 100644
--- a/myserver/binaries/web/cgi-bin/Makefile.am
+++ b/myserver/binaries/web/cgi-bin/Makefile.am
@@ -15,6 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-myserverdatadir = $(prefix)/var/web/cgi-bin
+defaultsitecgidir = $(pkgdatadir)/web/cgi-bin
 
-dist_myserverdata_DATA = default.html
+dist_defaultsitecgi_DATA = default.html
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am 
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index da9d097..e46ba74 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -34,3 +34,7 @@ clean-generic:
        rm -f  ../../cgi-bin/math_sum.mscgi
 
 .phony : math_sum.mscgi
+
+install-exec-hook:
+       rm -f $(DESTDIR)$(libdir)/libmath_sum.la
+       mv $(DESTDIR)$(libdir)/libmath_sum.mscgi 
$(DESTDIR)$(pkgdatadir)/web/cgi-bin
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am 
b/myserver/binaries/web/cgi-src/post/Makefile.am
index 3ba048c..88caca1 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -34,3 +34,7 @@ clean-generic:
        rm -f  ../../cgi-bin/post.mscgi
 
 .phony : post.mscgi
+
+install-exec-hook:
+       rm -f $(DESTDIR)$(libdir)/libpost.la
+       mv $(DESTDIR)$(libdir)/libpost.mscgi $(DESTDIR)$(pkgdatadir)/web/cgi-bin

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/Makefile.am                      |    6 +++---
 myserver/binaries/certificates/Makefile.am         |    5 +----
 myserver/binaries/logs/Makefile.am                 |    2 +-
 myserver/binaries/plugins/Makefile.am              |    2 +-
 myserver/binaries/system/Makefile.am               |    4 +++-
 myserver/binaries/web/Makefile.am                  |    4 ++--
 myserver/binaries/web/cgi-bin/Makefile.am          |    4 ++--
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    4 ++++
 myserver/binaries/web/cgi-src/post/Makefile.am     |    4 ++++
 9 files changed, 21 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU MyServer