diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-08 05:24:37 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-08 05:24:37 +0000 |
| commit | 88b0df8855671a6c3c296aa8ccedb592acd54e20 (patch) | |
| tree | 969817f910fa4498017ab99429a6c4a5783cd564 /usr.bin | |
| parent | 3ae673ed4906429db0db127513b8cbfd605ad6ef (diff) | |
| download | src-88b0df8855671a6c3c296aa8ccedb592acd54e20.tar.gz src-88b0df8855671a6c3c296aa8ccedb592acd54e20.zip | |
Merge r435,r443 from libarchive.googlecode.com: Let the compiler options
determine how to read config.h.
Notes
Notes:
svn path=/head/; revision=189515
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tar/bsdtar_platform.h | 2 | ||||
| -rw-r--r-- | usr.bin/tar/test/test.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h index 7cc684d7893c..53bec95d6e76 100644 --- a/usr.bin/tar/bsdtar_platform.h +++ b/usr.bin/tar/bsdtar_platform.h @@ -39,7 +39,7 @@ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ -#include "../config.h" +#include "config.h" #else /* Warn if bsdtar hasn't been (automatically or manually) configured. */ #error Oops: No config.h and no built-in configuration in bsdtar_platform.h. diff --git a/usr.bin/tar/test/test.h b/usr.bin/tar/test/test.h index bb7003eb9dbb..ea801e24b5ef 100644 --- a/usr.bin/tar/test/test.h +++ b/usr.bin/tar/test/test.h @@ -33,13 +33,13 @@ */ #if defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ -#include "../../config.h" +#include "config.h" #elif defined(__FreeBSD__) /* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "../config_freebsd.h" +#include "config_freebsd.h" #elif defined(_WIN32) /* Win32 can't run the 'configure' script. */ -#include "../config_windows.h" +#include "config_windows.h" #else /* Warn if the library hasn't been (automatically or manually) configured. */ #error Oops: No config.h and no pre-built configuration in test.h. |