diff options
| author | das <das> | 2005-06-23 06:00:26 (GMT) |
|---|---|---|
| committer | das <das> | 2005-06-23 06:00:26 (GMT) |
| commit | e73ef55a5933bee7c2841a1c87854417d8da71ff (patch) | |
| tree | 8690a90aac359fb2374b2f26bfa0d68e6e06f9dd | |
| parent | 8f4b4c54db724505dca2ab174792054c09138823 (diff) | |
| download | tk-e73ef55a5933bee7c2841a1c87854417d8da71ff.zip tk-e73ef55a5933bee7c2841a1c87854417d8da71ff.tar.gz tk-e73ef55a5933bee7c2841a1c87854417d8da71ff.tar.bz2 | |
* unix/Makefile.in (install-private-headers): rewrite tkPort.h when
installing private headers to remove ../unix relative #include path to
tkUnixPort.h (which is incorrect at the installed location).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | unix/Makefile.in | 10 |
2 files changed, 12 insertions, 6 deletions
@@ -1,7 +1,13 @@ -2005-06-21 Donal K. Fellows <donal.k.fellows@man.ac.uk> +2005-06-23 Daniel Steffen <das@users.sourceforge.net> *** 8.4.11 TAGGED FOR RELEASE *** + * unix/Makefile.in (install-private-headers): rewrite tkPort.h when + installing private headers to remove ../unix relative #include path to + tkUnixPort.h (which is incorrect at the installed location). + +2005-06-21 Donal K. Fellows <donal.k.fellows@man.ac.uk> + * doc/GetBitmap.3: Fix silly error in SYNOPSIS. [Bug 1224983] 2005-06-20 Donal K. Fellows <donal.k.fellows@man.ac.uk> diff --git a/unix/Makefile.in b/unix/Makefile.in index ee507dd..470cd81 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.87.2.10 2005/05/25 17:46:40 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.11 2005/06/23 06:00:29 das Exp $ # Current Tk version; used in various names. @@ -771,14 +771,14 @@ install-private-headers: libraries fi @echo "Installing private header files"; @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ - $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h \ $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS); \ do \ $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ done; - @if test -f tkConfig.h; then\ - $(INSTALL_DATA) tkConfig.h $(PRIVATE_INCLUDE_INSTALL_DIR); \ - fi; + @sed -e 's#\.\./unix/##' $(GENERIC_DIR)/tkPort.h > tkPort.h; \ + $(INSTALL_DATA) tkPort.h $(PRIVATE_INCLUDE_INSTALL_DIR); \ + rm -f tkPort.h Makefile: $(UNIX_DIR)/Makefile.in $(SHELL) config.status |