mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 19:08:30 +00:00
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001
|
|
From: "William A. Kennington III" <william@wkennington.com>
|
|
Date: Fri, 9 Jan 2015 14:52:11 -0800
|
|
Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files
|
|
|
|
---
|
|
Makefile.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index c97d1e1..763bf3b 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
|
|
@BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
|
|
@BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
|
|
@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
|
|
-@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \
|
|
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \
|
|
@BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \
|
|
@BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
|
|
@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
|
|
@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
|
|
@BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
|
|
@BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
|
|
@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
|
|
-@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
|
|
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \
|
|
@BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \
|
|
@BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
|
|
@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
|
|
--
|
|
2.1.4
|
|
|