diff options
| author | cperciva <cperciva@FreeBSD.org> | 2007-05-02 05:29:55 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2007-05-02 05:29:55 +0000 |
| commit | c5376d48acafbcba5ebbfb7d0f1cc34a0541e216 (patch) | |
| tree | 5cd48c6e66e2e37dc5b6ee942393929ea58b7ca5 /lib | |
| parent | db629f0c2f66769f40c6cb80a1133f57f9dd26ae (diff) | |
| download | FreeBSD-src-c5376d48acafbcba5ebbfb7d0f1cc34a0541e216.zip FreeBSD-src-c5376d48acafbcba5ebbfb7d0f1cc34a0541e216.tar.gz | |
s/@VERSION@/@ARCHIVE_VERSION@/
This is a no-op as far as FreeBSD is concerned, but makes libarchive
more autoconf-friendly.
Approved by: kientzle
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libarchive/Makefile | 2 | ||||
| -rw-r--r-- | lib/libarchive/archive.h.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index a1b8715..4581557 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -32,7 +32,7 @@ INCS= archive.h archive_entry.h # Note: FreeBSD has inttypes.h, so enable that include in archive.h.in archive.h: archive.h.in Makefile cat ${.CURDIR}/archive.h.in | \ - sed 's/@VERSION@/${VERSION}/g' | \ + sed 's/@ARCHIVE_VERSION@/${VERSION}/g' | \ sed 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' | \ sed 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' | \ sed 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' | \ diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in index 3fa3273..0f83800 100644 --- a/lib/libarchive/archive.h.in +++ b/lib/libarchive/archive.h.in @@ -30,7 +30,7 @@ /* * This header file corresponds to: - * Library version @VERSION@ + * Library version @ARCHIVE_VERSION@ * Shared library version @SHLIB_MAJOR@ */ @@ -73,7 +73,7 @@ int archive_api_version(void); #define ARCHIVE_API_FEATURE @ARCHIVE_API_MINOR@ int archive_api_feature(void); /* Textual name/version of the library. */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @VERSION@" +#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" const char * archive_version(void); #define ARCHIVE_BYTES_PER_RECORD 512 |
