diff options
author | axel <axel@liljencrantz.se> | 2006-07-19 02:41:55 +1000 |
---|---|---|
committer | axel <axel@liljencrantz.se> | 2006-07-19 02:41:55 +1000 |
commit | 57b3965518582bb3891d926e8615908f1ccba33c (patch) | |
tree | 62ef0d89ee332b3975c64ef68573a7fd36630c54 /Makefile.in | |
parent | 3e843f82195a0fdea18bbb31fb9677740370465a (diff) |
Initialize etc/fish and share/fish from the Makefile, not automatically by Autoconf. That way we get correct expansion of ${prefix} and friends to their install-time value. This fixes a bug reported by James Vega.
darcs-hash:20060718164155-ac50b-8ec6c63d9c4e52db2c1884fcffeab78333367773.gz
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0e1597ef..1bbabf9c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,6 @@ datadir = @datadir@ bindir = @bindir@ mandir = @mandir@ sysconfdir = @sysconfdir@ -fishinputfile = @fishinputfile@ docdir = @docdir@ #etc files to install @@ -184,7 +183,7 @@ TRANSLATIONS_SRC := $(wildcard po/*.po) TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) #Make everything needed for installing fish -all: $(PROGRAMS) user_doc +all: $(PROGRAMS) user_doc etc/fish share/fish @echo fish has now been built. @echo Use \'make install\' to install fish. .PHONY: all @@ -250,6 +249,10 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr cat $*.txt >>$@; echo "*/" >>$@ +%: %.in Makefile + sed <$@.in >$@ -e "s,@sysconfdir\@,$(sysconfdir)," -e "s,@datadir\@,$(datadir)," -e "s,@docdir\@,$(docdir)," -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|" +#-e "s,@\@,$()," + # Compile translation file %.gmo: if test $(HAVE_GETTEXT) = 1; then \ @@ -511,7 +514,7 @@ set_color: set_color.o doc_src/set_color.o common.o # Test program for the tokenizer library tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o - $(CC) ${CFLAGS} tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@ + $(CC) $(CFLAGS) tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@ # Neat little program to show output from terminal key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o |