stop doublecounting extracouponspace but do not gratuitiously change existing installs

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 59d2498..8847cde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -140,9 +140,11 @@ help:
        @echo
        @echo "                   install-docs install-perl-modules"
        @echo "                   install-init install-apache"
-       @echo "                   install-rt"
+       @echo "                   install-rt install-texmf"
        @echo "                   install-selfservice update-selfservice"
        @echo
+       @echo "                   install-texmf-forced"
+       @echo
        @echo "                   dev dev-docs dev-perl-modules"
        @echo
        @echo "                   masondocs alldocs docs"
@@ -198,6 +200,10 @@ perl-modules:
          s'%%%MASONDATA%%%'${MASONDATA}'g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+       " blib/lib/FS/Cron/*.pm;\
+       perl -p -i -e "\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
@@ -234,6 +240,12 @@ dev-perl-modules: perl-modules
        ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf: 
+       test -e `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty || \
+       install -D -o freeside -m 444 etc/fslongtable.sty \
+          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
+       texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
+
+install-texmf-forced:  
        install -D -o freeside -m 444 etc/fslongtable.sty \
           `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
        texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`