s_fsa/Makefile.patch

   1 --- Makefile.orig       2010-09-12 20:56:54.000000000 +0200
   2 +++ Makefile    2010-09-16 21:18:33.720000008 +0200
   3 @@ -9,7 +9,8 @@
   4
   5
   6  # Installation program
   7 -INSTALL = cp -i
   8 +INSTALL = install -m644
   9 +INSTALL_BIN = install -m755
  10
  11  # C++ compiler
  12  CXX=g++
  13 @@ -88,11 +89,8 @@
  14    -DFLEXIBLE  \
  15    -DNUMBERS \
  16    -DA_TERGO \
  17 -  -DGENERALIZE \
  18 -  -DSORT_ON_FREQ \
  19    -DSHOW_FILLERS  \
  20    -DSTOPBIT \
  21 -  -DNEXTBIT \
  22    -DMORE_COMPR \
  23    -DCASECONV \
  24    -DRUNON_WORDS \
  25 @@ -101,7 +99,6 @@
  26    -DCHCLASS \
  27    -DGUESS_LEXEMES -DGUESS_PREFIX \
  28    -DGUESS_MMORPH \
  29 -  -DDUMP_ALL \
  30    -DLOOSING_RPM #-DDMALLOC
  31
  32
  33 @@ -145,6 +142,11 @@
  34  # to which man section man pages for fsa belong
  35  MANSECT1 = 1
  36  MANSECT5 = 5
  37 +# Hardcoded paths for in-file replacements
  38 +BINDIRFILE = ${BINDIR}
  39 +DICTDIRFILE = ${DICTDIR}
  40 +TCLMACQDIRFILE = ${TCLMACQDIR}
  41 +TCLMACQBINDIRFILE = ${TCLMACQBINDIR}
  42
  43  ########################################################################
  44
  45 @@ -332,7 +334,7 @@
  46         else echo "Directory ${MANDIR}/man${MANSECT5} does not exist!" ; fi
  47
  48  installbin: ${ALL_PROGS}
  49 -       ${INSTALL} ${ALL_PROGS} ${BINDIR}
  50 +       ${INSTALL_BIN} ${ALL_PROGS} ${BINDIR}
  51
  52  installbuild: fsa_build
  53         ${INSTALL} fsa_build ${BINDIR}
  54 @@ -340,16 +342,16 @@
  55  installscripts:
  56         if [ -d ${BINDIR} ] ; then \
  57         for s in ${SKL_SCRIPTS} ; \
  58 -       do sed -e "s|XXX_DICT_DIR|${DICTDIR}|g" \
  59 -               -e "s|XXX_EXEC_DIR|${BINDIR}|g" < $${s}-skeleton > $${s} ; \
  60 +       do sed -e "s|XXX_DICT_DIR|${DICTDIRFILE}|g" \
  61 +               -e "s|XXX_EXEC_DIR|${BINDIRFILE}|g" < $${s}-skeleton > $${s} ; \
  62         done ; \
  63         for s in ${TCL_SCRIPTS} ; \
  64 -       do sed -e "s|@TCLMACQDIR@|${TCLMACQDIR}|g" \
  65 -               -e "s|@TCLMACQBINDIR@|${TCLMACQBINDIR}|g" \
  66 +       do sed -e "s|@TCLMACQDIR@|${TCLMACQDIRFILE}|g" \
  67 +               -e "s|@TCLMACQBINDIR@|${TCLMACQBINDIRFILE}|g" \
  68                 -e "s|@Q@|${PREP_FCONF}|g" < $${s}.in > $${s} ; \
  69         done; \
  70          chmod 0755 ${ALL_SCRIPTS} ; \
  71 -        ${INSTALL} ${ALL_SCRIPTS} ${BINDIR} ;\
  72 +        ${INSTALL_BIN} ${ALL_SCRIPTS} ${BINDIR} ;\
  73         ${INSTALL} ${TCL_SUPP_FILES} ${TCLMACQDIR} ; \
  74         else echo "Directory ${BINDIR} does not exist!" ; fi
  75