diff options
| author |  axel <axel@liljencrantz.se> | 2006-07-20 00:41:04 +1000 |
|---|---|---|
| committer | axel <axel@liljencrantz.se> | 2006-07-20 00:41:04 +1000 |
| commit | 46c6f7880bebcdb3589e6e8d67a2c192076a540d (patch) | |
| tree | 5f3f548547fe15cf05951f85bc927af97ea84a39 /Makefile.in | |
| parent | bef7fff38330872b0e1c5b8a7501c09e4ed1ad1a (diff) | |
Set value of install path macros like DATADIR from the Makefile, not automatically by Autoconf using AC_DEFINE. 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:20060719144104-ac50b-05001b151a54bf893ff4c5a82c5f040529e27f57.gz
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 1bbabf9c..01a355ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,10 +36,6 @@ CC := @CC@ INSTALL:=@INSTALL@ -CFLAGS:=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -LDFLAGS:= @LIBS@ @LDFLAGS@ - # Installation directories prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -48,6 +44,13 @@ bindir = @bindir@ mandir = @mandir@ sysconfdir = @sysconfdir@ docdir = @docdir@ +localedir = @localedir@ +prefix = @prefix@ + +CFLAGS:=@CFLAGS@ -DLOCALEDIR=L\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" +CPPFLAGS=@CPPFLAGS@ +LDFLAGS:= @LIBS@ @LDFLAGS@ + #etc files to install ETC_DIR_INSTALL = etc/fish_interactive.fish |