[myserver-commit] [2824] Fixed make install problem.

[Giuseppe Scrivano]

Revision: 2824
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2824
Author:   gscrivano
Date:     2008-09-18 21:02:29 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Fixed make install problem.  Now by default `$root_prefix' is `$(DESTDIR)'.

Modified Paths:
--------------
    trunk/myserver/binaries/certificates/Makefile.am
    trunk/myserver/binaries/web/Makefile.am
    trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
    trunk/myserver/binaries/web/cgi-src/post/Makefile.am
    trunk/myserver/configure.in

Added Paths:
-----------
    trunk/myserver/binaries/certificates/how_create_certificates.txt

Removed Paths:
-------------
    trunk/myserver/binaries/certificates/how create certificates.txt

Modified: trunk/myserver/binaries/certificates/Makefile.am
===================================================================
--- trunk/myserver/binaries/certificates/Makefile.am    2008-09-18 19:44:46 UTC 
(rev 2823)
+++ trunk/myserver/binaries/certificates/Makefile.am    2008-09-18 21:02:29 UTC 
(rev 2824)
@@ -1,4 +1,4 @@
  
 install :
        $(INSTALL) -d '$(root_prefix)/etc/myserver/certificates'
-       $(INSTALL) 'how create certificates.txt' 
'$(root_prefix)/etc/myserver/certificates/how create certificates.txt'
+       $(INSTALL) 'how_create_certificates.txt' 
'$(root_prefix)/etc/myserver/certificates/how_create_certificates.txt'

Deleted: trunk/myserver/binaries/certificates/how create certificates.txt
===================================================================
--- trunk/myserver/binaries/certificates/how create certificates.txt    
2008-09-18 19:44:46 UTC (rev 2823)
+++ trunk/myserver/binaries/certificates/how create certificates.txt    
2008-09-18 21:02:29 UTC (rev 2824)
@@ -1,15 +0,0 @@
-Use the openSSL package that you can get at
-http://www.openssl.org. 
-
-After you have installed openSSL, execute the following commands:
-
-openssl genrsa  -out server.key 
-openssl req -new -x509 -days 730 -key server.key -out server.pem 
-
-These commands will create two files server.key and server.pem. Put
-them in this directory and configure your virtual host file to use these
-files adding the following lines under the <VHOST> section:
-
-<SSL_PRIVATEKEY>certificates/server.key</SSL_PRIVATEKEY>
-<SSL_CERTIFICATE>certificates/server.pem</SSL_CERTIFICATE>
-<SSL_PASSWORD></SSL_PASSWORD>

Copied: trunk/myserver/binaries/certificates/how_create_certificates.txt (from 
rev 2821, trunk/myserver/binaries/certificates/how create certificates.txt)
===================================================================
--- trunk/myserver/binaries/certificates/how_create_certificates.txt            
                (rev 0)
+++ trunk/myserver/binaries/certificates/how_create_certificates.txt    
2008-09-18 21:02:29 UTC (rev 2824)
@@ -0,0 +1,15 @@
+Use the openSSL package that you can get at
+http://www.openssl.org. 
+
+After you have installed openSSL, execute the following commands:
+
+openssl genrsa  -out server.key 
+openssl req -new -x509 -days 730 -key server.key -out server.pem 
+
+These commands will create two files server.key and server.pem. Put
+them in this directory and configure your virtual host file to use these
+files adding the following lines under the <VHOST> section:
+
+<SSL_PRIVATEKEY>certificates/server.key</SSL_PRIVATEKEY>
+<SSL_CERTIFICATE>certificates/server.pem</SSL_CERTIFICATE>
+<SSL_PASSWORD></SSL_PASSWORD>


Property changes on: 
trunk/myserver/binaries/certificates/how_create_certificates.txt
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Modified: trunk/myserver/binaries/web/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/Makefile.am     2008-09-18 19:44:46 UTC (rev 
2823)
+++ trunk/myserver/binaries/web/Makefile.am     2008-09-18 21:02:29 UTC (rev 
2824)
@@ -1,4 +1,3 @@
-
 if BUILD_MSCGI
 CGI_SRC = cgi-src
 endif

Modified: trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-09-18 
19:44:46 UTC (rev 2823)
+++ trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-09-18 
21:02:29 UTC (rev 2824)
@@ -9,13 +9,12 @@
 
 libmath_sum.a :
 
-       
 math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
        -rm -f math_sum.mscgi
        $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared
 
 install : math_sum.mscgi
-       $(INSTALL) 'math_sum.mscgi' 
'$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'
+       $(INSTALL) -D 'math_sum.mscgi' 
'$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'
 
 
 clean :

Modified: trunk/myserver/binaries/web/cgi-src/post/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-09-18 
19:44:46 UTC (rev 2823)
+++ trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-09-18 
21:02:29 UTC (rev 2824)
@@ -15,7 +15,7 @@
        $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi 
-shared
 
 install : post.mscgi
-       $(INSTALL) 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'
+       $(INSTALL) -D 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'
 
 clean :
        rm -f post.mscgi

Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in 2008-09-18 19:44:46 UTC (rev 2823)
+++ trunk/myserver/configure.in 2008-09-18 21:02:29 UTC (rev 2824)
@@ -27,7 +27,7 @@
 
 AM_INIT_AUTOMAKE
 
-PACKAGE_STRING=`cat version`
+PACKAGE_STRING= m4_esyscmd([cat version])
 MYSERVER_VERSION="${PACKAGE_STRING}"
 
 AC_SUBST(MYSERVER_VERSION)
@@ -51,8 +51,9 @@
 CXXFLAGS="$CXXFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 LDFLAGS="$LDFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 
-AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix 
variable for files to be placed in the root], root_prefix=$withval, 
root_prefix="")
+AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix 
variable for files to be placed in the root], root_prefix=$withval, 
root_prefix="\$(DESTDIR)")
 
+
 AC_ARG_ENABLE([control-gui], [ --disable-control-gui disable the 
myserver-configure GUI program], enable_control="no", enable_control="yes")
 
 AC_ARG_ENABLE([ipv6], [  --enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")