buildsys: add build PVE folder to LD_LIBRARY_PATH and PERLLIB

ensures that the PVE modules and libraries currently build get used,
not the installed ones.

Besides correctness from a Packaging POV this also makes bootstrapping
easier.

Reported-by: Rhonda D'Vine <rhonda@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/data/Makefile b/data/Makefile
index ebd35c574e95073f335a4c6b107aed1d4faf533f..5592a5ecdb859bd3873473112845ec242763d3a2 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,8 @@
 SUBDIRS := PVE src test
 
+export LD_LIBRARY_PATH+=$(CURDIR)/PVE
+export PERLLIB+=$(CURDIR)/PVE
+
 all:
        for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 

diff --git a/data/PVE/Makefile b/data/PVE/Makefile
index f4042dda83637374435fc153a66b2605df7833a0..81da87b36bb867886b06bf2350e1c327310b9630 100644 (file)
--- a/data/PVE/Makefile
+++ b/data/PVE/Makefile
@@ -24,14 +24,14 @@ install: pvecm ${SOURCES} IPCC.so pvecm.1 pvecm.bash-completion datacenter.cfg.5
        for d in ${SUBDIRS}; do $(MAKE) -C $$d install; done
 
 %.bash-completion:
-       LD_LIBRARY_PATH=. perl -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
+       perl -I.. -T -e "use PVE::CLI::$*; PVE::CLI::$*->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
 Cluster/IPCConst.pm:
        $(MAKE) -C Cluster IPCConst.pm
 
 check: IPCC.so Cluster/IPCConst.pm
-       LD_LIBRARY_PATH=. perl -I.. -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
+       perl -I.. -T -e "use PVE::CLI::pvecm; PVE::CLI::pvecm->verify_api();"
 
 CC=gcc
 CFLAGS += -fPIC -Wl,-z,relro -Wall -Werror -Wno-strict-aliasing -g -O2 -shared
@@ -48,7 +48,6 @@ IPCC.c: IPCC.xs ppport.h
 IPCC.so: IPCC.o
        $(CC) ${CFLAGS} ${LDFLAGS} -shared -o $@ $<
 
-export PERLLIB=..
 export NOVIEW=1
 -include /usr/share/pve-doc-generator/pve-doc-generator.mk