Skip to content

Commit

Permalink
Don't touch the system linker if installing into a packaging root.
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosefr committed Jan 2, 2015
1 parent ee6a51d commit 9096476
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ install: all kyotocabinet/Makefile kyototycoon/Makefile
$(MAKE) -j$(NPROCS) -C kyotocabinet install DESTDIR="$(DESTDIR)"
$(MAKE) -j$(NPROCS) -C kyototycoon install DESTDIR="$(DESTDIR)"

# Update the system linker search path if allowed...
ifeq ("yes","$(shell test -w /etc/ld.so.conf.d && echo yes)")
# Update the system linker search path if allowed (and not installing into a packaging root).
# For packages (eg. ".deb", ".rpm"), this should be done in the packaging configuration/scripts...
ifeq ("yes","$(shell test -z '$(DESTDIR)' && test -w /etc/ld.so.conf.d && echo yes)")
$(eval CABINET_LIBDIR := $(shell awk '/^prefix *=/ {print $$3}' kyotocabinet/Makefile)/lib)
test -n "$(shell /sbin/ldconfig -vN 2>&1 | grep -o '^$(CABINET_LIBDIR):')" || echo "$(CABINET_LIBDIR)" > /etc/ld.so.conf.d/kyoto-cabinet.conf
$(eval TYCOON_LIBDIR := $(shell awk '/^prefix *=/ {print $$3}' kyototycoon/Makefile)/lib)
Expand Down

0 comments on commit 9096476

Please sign in to comment.