[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/
commit: 98da5a43c657ad65526b9f58ca990809cb9c49b8 Author: Michał Górny gentoo org> AuthorDate: Tue Nov 10 18:15:01 2020 + Commit: Michał Górny gentoo org> CommitDate: Tue Nov 10 19:20:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98da5a43 net-libs/http-parser: Backport non-x86 test fix Closes: https://bugs.gentoo.org/753887 Signed-off-by: Michał Górny gentoo.org> .../files/http-parser-2.9.4-non-x86-test.patch | 20 net-libs/http-parser/http-parser-2.9.4.ebuild| 4 2 files changed, 24 insertions(+) diff --git a/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch new file mode 100644 index 000..8bcbbf3589a --- /dev/null +++ b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch @@ -0,0 +1,20 @@ +diff --git a/test.c b/test.c +index 53a3163..49c4b7a 100644 +--- a/test.c b/test.c +@@ -4343,7 +4343,13 @@ main (void) + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); ++ ++#if defined(__i386__) || defined(__x86_64__) ++ /* Should be 32 on both 32 bits and 64 bits x86 because of struct padding, ++ * see https://github.com/nodejs/http-parser/issues/507. ++ */ ++ assert(sizeof(http_parser) == 24 + sizeof(void*)); ++#endif + + API + test_preserve_data(); + diff --git a/net-libs/http-parser/http-parser-2.9.4.ebuild b/net-libs/http-parser/http-parser-2.9.4.ebuild index c335060fa9a..01dcd50e086 100644 --- a/net-libs/http-parser/http-parser-2.9.4.ebuild +++ b/net-libs/http-parser/http-parser-2.9.4.ebuild @@ -12,6 +12,10 @@ LICENSE="MIT" SLOT="0/2.9.0" KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" +PATCHES=( + "${FILESDIR}"/${P}-non-x86-test.patch +) + src_prepare() { default tc-export CC AR
[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/
commit: 6f5ac8dee85a2732348fe84c790b3646741d0c24 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Dec 6 09:55:14 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Dec 6 09:55:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5ac8de net-libs/http-parser: Old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> net-libs/http-parser/Manifest | 2 - .../files/0001-makefile-fix-DESTDIR-usage.patch| 64 -- .../files/0002-makefile-quote-variables.patch | 50 - ...x-SONAME-symlink-it-should-not-be-a-full-.patch | 35 ...04-makefile-add-CFLAGS-to-linking-command.patch | 31 --- ...0005-makefile-fix-install-rule-dependency.patch | 33 --- .../files/http-parser-2.6.2-darwin.patch | 16 -- net-libs/http-parser/http-parser-2.6.2.ebuild | 45 --- net-libs/http-parser/http-parser-2.8.0.ebuild | 35 9 files changed, 311 deletions(-) diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 1f9ae37e62f..8557aad9d1f 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -1,3 +1 @@ -DIST http-parser-2.6.2.tar.gz 48292 BLAKE2B 054ffa66960bad29a31e1a697a035447eb551fb85ed2af3786664f161d8d5a62aad8142ce859b7f1af85489b703b188d09980bf82b56cb190c21ecbe9c3a2f5c SHA512 e19e5377b3eb7f149c428196826fb878564fdfa3716ff6df5a3845c51586aee0582e252e09d1f8ebad1163b3e66632ff0c6e78f6acb2f0da20d7a06e734406c1 -DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1aa2f152ff4a67580e99ab113b44544f98b2e33fa1fadb259144975f15dc69c8b0ecc9de59e603dbd0e0a0785b7976 SHA512 57252a29b75f91452fd9bf2d3805bf1ddd95c32aee864cbe47dc676861512b9db95a7b3a4e1b999d5c046ab0d50809e7f184994c24ad48fe97cc2bcc27d9eb7b DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883 diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch deleted file mode 100644 index a819cf441d3..000 --- a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Mon, 2 Nov 2015 16:24:43 +0100 -Subject: [PATCH 1/4] makefile: fix DESTDIR usage - -DESTDIR is not supposed to be set inside other variables. It is -standard to have this variable in install/uninstall rules, so it -can be reliably set separately no matter what other variables are set -to. -This also avoids potential bugs with setting SONAME or seds on -installed files (like pkgconfig) which then might include the -temporary DESTDIR directory. - -DESTDIR is really just for installing into a temporary directory or -a chroot, mostly used by package managers. - Makefile | 20 ++-- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index 33c8ba0..76153a0 100644 a/Makefile -+++ b/Makefile -@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC - LDFLAGS_LIB = $(LDFLAGS) -shared - - INSTALL ?= install --PREFIX ?= $(DESTDIR)/usr/local -+PREFIX ?= /usr/local - LIBDIR = $(PREFIX)/lib - INCLUDEDIR = $(PREFIX)/include - -@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c - ctags $^ - - install: library -- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) - - install-strip: library -- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) - - uninstall: -- rm $(INCLUDEDIR)/http_parser.h -- rm $(LIBDIR)/$(SONAME) -- rm $(LIBDIR)/libhttp_parser.so -+ rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ rm $(DESTDIR)$(LIBDIR)/$(SONAME) -+ rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so - - clean: - rm -f *.o *.a tags test test_fast test_g \ --- -2.6.1 - diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch
[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/
commit: ad6508154b1c708e47f132183b3ef33a5941b1db Author: Tim Harder gentoo org> AuthorDate: Wed Aug 23 04:37:11 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Aug 23 04:37:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad650815 net-libs/http-parser: remove old net-libs/http-parser/Manifest | 5 --- .../http-parser/files/http-parser-2.3-flags.patch | 32 net-libs/http-parser/http-parser-2.3.ebuild| 40 net-libs/http-parser/http-parser-2.4.1.ebuild | 42 - net-libs/http-parser/http-parser-2.4.2.ebuild | 42 - net-libs/http-parser/http-parser-2.5.0.ebuild | 41 net-libs/http-parser/http-parser-2.6.1.ebuild | 44 -- 7 files changed, 246 deletions(-) diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 1a4df285f76..097155ffb5b 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -1,7 +1,2 @@ -DIST http-parser-2.3.tar.gz 42538 SHA256 3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c17b213655166f6a3cb8d21d5e2 SHA512 63ec361dd0bdb2d30676b430fc122eb4df5a6ff90a6a188ee9975ea9c46263f0322ebf51fb1816643d1b8d58bfd8793d7c6e2f6bd96778539095517ea320de2e WHIRLPOOL 8bc4d67857d2ac57bcac46c012f521c374f2875b7a4edb987189571b27ccb8ea5544b0b7eeba56b1f3f1a7bb1680a9a33821aab3863e373be12f3eba85371c66 -DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb -DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff -DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254 -DIST http-parser-2.6.1.tar.gz 48265 SHA256 48ce852009121e9959c28408017902423ed0b5125de923cd0fdde77fce862aad SHA512 98e34bfb18d5d1e36225f10600c82dc0c818190a07ee8c19096cef2527ddf33e238cae6ccb7ae1f99854d9c76779b693c02a24d807504ba41dcb33f08a2beb72 WHIRLPOOL 59b4a3502f71eb704855e19263f18a282ea21f751a1356eeacc2a5480c5df46a0173ddfef19ae9c22836c73f32bb17b1d25aa5ba6b5a874795b9ed97d26ea24f DIST http-parser-2.6.2.tar.gz 48292 SHA256 80fffc3b64ef6968cecdd4b299a96986007dff4bd12ae6c58cbcb506959b90ad SHA512 e19e5377b3eb7f149c428196826fb878564fdfa3716ff6df5a3845c51586aee0582e252e09d1f8ebad1163b3e66632ff0c6e78f6acb2f0da20d7a06e734406c1 WHIRLPOOL 25e5f3ff8bc37d8a06d1929e31683326bb4d3a13f1e899e4f357787973be56fc007dd4ad16567067a9bce587ddc81360f777332a097fbb6dcf22cbad26872962 DIST http-parser-2.7.1.tar.gz 48578 SHA256 70409ad324e5de2da6a0f39e859e566d497c1ff0a249c0c38a5012df91b386b3 SHA512 c0fe86455db1a563a5c668f118dfa9a27b9a637ee1c0e2f2f18a5b816352436ed90435ea978e3f3d85b037d3c630234e47d609dc3b7086b898286c4e54d9f031 WHIRLPOOL be51ed5aed8a01d8d544a21a87f3d1c928c1e2bdca95c71f42ff291a9381381e9fa6d437e52b5818526e59ea81fdf3d92792b6c4f32af62ff169582d57d7ee1d diff --git a/net-libs/http-parser/files/http-parser-2.3-flags.patch b/net-libs/http-parser/files/http-parser-2.3-flags.patch deleted file mode 100644 index 3dc9b3305ad..000 --- a/net-libs/http-parser/files/http-parser-2.3-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 3752e633e23284133decc8ca8481e4416a317fbc -Author: hasufell-Date: Sun Jun 30 12:27:04 2013 +0200 - -respect system flags - -diff --git a/Makefile b/Makefile -index 64e5c2f..2e20723 100644 a/Makefile -+++ b/Makefile -@@ -7,9 +7,9 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA) - CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0 - CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA) - --CFLAGS += -Wall -Wextra -Werror --CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA) --CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA) -+CFLAGS += -Wall -Wextra -+CFLAGS_DEBUG = $(CFLAGS) $(CFLAGS_DEBUG_EXTRA) -+CFLAGS_FAST = $(CFLAGS) $(CFLAGS_FAST_EXTRA) - CFLAGS_LIB = $(CFLAGS_FAST) -fPIC - - test: test_g test_fast -@@ -44,7 +44,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile - $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o - - library:
[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/
commit: ebfa98e3e9c35aea2cc51204ddbf63710a81b783 Author: Fabian Groffen gentoo org> AuthorDate: Tue Mar 7 08:07:34 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Mar 7 08:08:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebfa98e3 net-libs/http-parser: add patch to fix install_name on Darwin, bug #546098 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../http-parser/files/http-parser-2.6.2-darwin.patch | 16 net-libs/http-parser/http-parser-2.6.2.ebuild| 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch b/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch new file mode 100644 index 000..b04b4a32bb0 --- /dev/null +++ b/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch @@ -0,0 +1,16 @@ +Makefile: set install_name on Darwin + +https://bugs.gentoo.org/show_bug.cgi?id=546098 +https://github.com/nodejs/http-parser/issues/356 + +--- http-parser-2.6.2/Makefile http-parser-2.6.2/Makefile +@@ -62,6 +62,8 @@ + ifneq (darwin,$(PLATFORM)) + # TODO(bnoordhuis) The native SunOS linker expects -h rather than -soname... + LDFLAGS_LIB += -Wl,-soname=$(SONAME) ++else ++LDFLAGS_LIB += -Wl,-install_name,$(LIBDIR)/$(SONAME) + endif + + test: test_g test_fast diff --git a/net-libs/http-parser/http-parser-2.6.2.ebuild b/net-libs/http-parser/http-parser-2.6.2.ebuild index 62d9938548b..33986a95474 100644 --- a/net-libs/http-parser/http-parser-2.6.2.ebuild +++ b/net-libs/http-parser/http-parser-2.6.2.ebuild @@ -21,6 +21,7 @@ PATCHES=( "${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch "${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch "${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch + "${FILESDIR}"/${PN}-2.6.2-darwin.patch ) src_prepare() { @@ -30,7 +31,7 @@ src_prepare() { } multilib_src_compile() { - emake CFLAGS_FAST="${CFLAGS}" library + emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library use static-libs && emake CFLAGS_FAST="${CFLAGS}" package }
[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/
commit: 2dcfb00c893c3190165f76a9b592fcf25b813809 Author: Julian Ospald gentoo org> AuthorDate: Mon Nov 2 16:04:10 2015 + Commit: Julian Ospald gentoo org> CommitDate: Mon Nov 2 16:05:41 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcfb00c net-libs/http-parser: version bump This also fixes the upstream build system instead of working around it. It also fixes missing CFLAGS in linking commands. net-libs/http-parser/Manifest | 1 + .../files/0001-makefile-fix-DESTDIR-usage.patch| 64 ++ .../files/0002-makefile-quote-variables.patch | 50 + ...x-SONAME-symlink-it-should-not-be-a-full-.patch | 35 ...04-makefile-add-CFLAGS-to-linking-command.patch | 31 +++ ...0005-makefile-fix-install-rule-dependency.patch | 33 +++ net-libs/http-parser/http-parser-2.6.0.ebuild | 45 +++ 7 files changed, 259 insertions(+) diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 2d8af53..10f268e 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -2,3 +2,4 @@ DIST http-parser-2.3.tar.gz 42538 SHA256 3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c1 DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254 +DIST http-parser-2.6.0.tar.gz 47598 SHA256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 SHA512 e7bd34ed8270192e55f5e7495972afc9fe2adc36d85df4f09be4958bbf7f93872a056bb8db268cdc1068a9eb79ad9aefc2a8502bda92bac8a2490e08435f09e1 WHIRLPOOL 2bef86db5140c04a2d7e2191e5669c905368a1180c357c512a66a65907b23b317bd2466aa9b1a47c1287e9def7aecdab48c151343b1700d99514b47915df7bf5 diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch new file mode 100644 index 000..a819cf4 --- /dev/null +++ b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch @@ -0,0 +1,64 @@ +From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001 +From: hasufell+Date: Mon, 2 Nov 2015 16:24:43 +0100 +Subject: [PATCH 1/4] makefile: fix DESTDIR usage + +DESTDIR is not supposed to be set inside other variables. It is +standard to have this variable in install/uninstall rules, so it +can be reliably set separately no matter what other variables are set +to. +This also avoids potential bugs with setting SONAME or seds on +installed files (like pkgconfig) which then might include the +temporary DESTDIR directory. + +DESTDIR is really just for installing into a temporary directory or +a chroot, mostly used by package managers. +--- + Makefile | 20 ++-- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 33c8ba0..76153a0 100644 +--- a/Makefile b/Makefile +@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC + LDFLAGS_LIB = $(LDFLAGS) -shared + + INSTALL ?= install +-PREFIX ?= $(DESTDIR)/usr/local ++PREFIX ?= /usr/local + LIBDIR = $(PREFIX)/lib + INCLUDEDIR = $(PREFIX)/include + +@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c + ctags $^ + + install: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) + + install-strip: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h