diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-07-04 12:49:01 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-07-04 12:49:01 +0000 |
| commit | 39de0bca42b440754233b339dfc0878e71cf99d3 (patch) | |
| tree | 85562e7179aaa8327ee48f01bf0fc94475dac250 | |
| parent | 0f8ef7432cbbcc0b6b81240acd8b8e3d941c20f3 (diff) | |
Build GF/Today.hs directly from Makefile. Include libdir.
| -rw-r--r-- | src/FILES | 1 | ||||
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/tools/mktoday.sh | 8 |
3 files changed, 8 insertions, 11 deletions
@@ -258,4 +258,3 @@ util/HelpFile source of ../HelpFile.hs util/Htmls.hs utility for chopping a HTML document to slides util/MkHelpFile.hs util/WriteF.hs -util/mktoday.sh [SHELL-SCRIPT] utility for producing Today.hs diff --git a/src/Makefile b/src/Makefile index 856e668a2..eda520656 100644 --- a/src/Makefile +++ b/src/Makefile @@ -129,7 +129,14 @@ ghci-nofud: $(GHCI) $(GHCFLAGS) today: - tools/mktoday.sh $(PACKAGE_VERSION) + echo 'module GF.Today (today,version,libdir) where' > GF/Today.hs + echo '{-# NOINLINE today,version,libdir #-}' >> GF/Today.hs + echo 'today :: String' >> GF/Today.hs + echo 'today = "'`date`'"' >> GF/Today.hs + echo 'version :: String' >> GF/Today.hs + echo 'version = "'$(PACKAGE_VERSION)'"' >> GF/Today.hs + echo 'libdir :: String' >> GF/Today.hs + echo 'libdir = "'$(GF_DATA_DIR)/lib'"' >> GF/Today.hs javac: $(JAVAC) $(JAVAFLAGS) -classpath $(GFEDITOR)/jargs-1.0.jar $(GFEDITOR)/de/uka/ilkd/key/ocl/gf/*.java @@ -200,7 +207,6 @@ dist: cp -r ../_darcs/current $(DIST_DIR) cd $(DIST_DIR)/src && perl -pi -e "s/^AC_INIT\(\[GF\],\[[^\]]*\]/AC_INIT([GF],[$(PACKAGE_VERSION)]/" configure.ac cd $(DIST_DIR)/src && autoconf && rm -rf autom4te.cache - cd $(DIST_DIR)/src && chmod a+x tools/mktoday.sh # cd $(DIST_DIR)/grammars && sh mkLib.sh cd $(DIST_DIR) && rm -rf $(NOT_IN_DIST) $(TAR) -zcf $(DIST_DIR).tgz $(DIST_DIR) diff --git a/src/tools/mktoday.sh b/src/tools/mktoday.sh deleted file mode 100644 index 1865fd4d1..000000000 --- a/src/tools/mktoday.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo 'module GF.Today (today,version) where' > GF/Today.hs -echo '{-# NOINLINE today #-}' >> GF/Today.hs -echo 'today,version :: String' >> GF/Today.hs -echo 'today = "'`date`'"' >> GF/Today.hs -echo 'version = "'$1'"' >> GF/Today.hs - |