X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=1163237b80353e6a9bf9db4fba74c65b7cd55f89;hb=f29c752d6f9e813c10295b334eefb924216e34cf;hp=2c5abf9c97bb0114ee1e89016fbd00f5d4742ff2;hpb=fc4e700637d938bb7366c3d273a4aeefc2272e0c;p=freeside.git

diff --git a/Makefile b/Makefile
index 2c5abf9c9..1163237b8 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,8 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb
-HTTPD_RESTART = /etc/init.d/apache reload
-#suse
-#HTTPD_RESTART = /etc/init.d/apache restart
+#deb, suse
+HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -102,8 +100,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.7/
 
-VERSION=1.5.8cvs
-TAG=freeside_1_5_8
+VERSION=1.7.0cvs
+TAG=freeside_1_7_0
 
 help:
 	@echo "supported targets:"
@@ -198,7 +196,10 @@ perl-modules:
 	make; \
 	perl -p -i -e "\
 	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm
+	" blib/lib/FS.pm; \
+	perl -p -i -e "\
+	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" blib/lib/FS/CGI.pm
 
 install-perl-modules: perl-modules
 	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -208,13 +209,13 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install UNINST=1
 
-dev-perl-modules:
+dev-perl-modules: perl-modules
 	[ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
 	  && mv ${PERL_INC_DEV_KLUDGE}/FS ${PERL_INC_DEV_KLUDGE}/FS.old \
 	  || true
 
 	rm -rf ${PERL_INC_DEV_KLUDGE}/FS
-	ln -sf ${FREESIDE_PATH}/FS/FS ${PERL_INC_DEV_KLUDGE}/FS
+	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}