Skip to content

Commit

Permalink
Put .pc and compiled data in /share/, not /lib/ (following Debian/aut…
Browse files Browse the repository at this point in the history
…otools standards)

pkgconfigdir=$(libdir)/pkgconfig → pkgconfigdir=$(prefix)/share/pkgconfig
AP_LIB → AP_SRC
apertium_XXXdir=$(prefix)/lib/apertium/$(BASENAME)/ → apertium_XXXdir=$(prefix)/share/apertium/$(BASENAME)/

put share/pkgconfig in PKG_CONFIG_PATH in autogen.sh
  • Loading branch information
unhammer committed Jun 9, 2014
1 parent 995979f commit 9aca46f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ EXTRA_DIST=$(BASENAME).$(LANG1).dix \
## Installation stuff
###############################################################################
#
# apertium_nob_libdir: This is where the compiled binaries go
# apertium_nob_dir: This is where the compiled binaries go
# apertium_nob_srcdir: This is where the source files go

apertium_nobdir=$(prefix)/lib/apertium/$(BASENAME)/
apertium_nobdir=$(prefix)/share/apertium/$(BASENAME)/
apertium_nob_srcdir=$(prefix)/share/apertium/$(BASENAME)/

apertium_nob_DATA=$(TARGETS_COMMON) $(LANG1).prob

pkgconfigdir = $(libdir)/pkgconfig
pkgconfigdir = $(prefix)/share/pkgconfig
pkgconfig_DATA = $(BASENAME).pc

# Modes are not installed since they're all just "debug modes". All
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PATH="${PATH}:/usr/local/bin"
export PATH
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib"
export LD_LIBRARY_PATH
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/lib/pkgconfig"
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/share/pkgconfig:${PREFIX}/lib/pkgconfig"
export PKG_CONFIG_PATH
ACLOCAL_PATH="${ACLOCAL_PATH}:${PREFIX}/share/aclocal"
export ACLOCAL_PATH
Expand Down

0 comments on commit 9aca46f

Please sign in to comment.