Permalink
Browse files

respect $PREFIX on install

$PREFIX is a very common convention when installing software,
especially with autoconf, which the OTR plugin uses.

This makes sure that the `--prefix` flag in configure affects all
relevant portions of the install code.

Closes #53.
  • Loading branch information...
1 parent 4ad3b7b commit 6f6f8f4b389facd5fc89df1330679d41a73cc828 @anarcat anarcat committed Mar 22, 2016
Showing with 3 additions and 3 deletions.
  1. +1 −1 configure.ac
  2. +1 −1 help/Makefile.am
  3. +1 −1 src/Makefile.am
View
@@ -77,7 +77,7 @@ AC_SUBST(DEFAULT_INCLUDES)
AC_ARG_WITH([irssi-module-dir],
AS_HELP_STRING([--with-irssi-module-dir=DIR], [Irssi module directory]),
[IRSSI_MODULE_DIR="$withval"],
- [IRSSI_MODULE_DIR="/usr/lib/irssi/modules"])
+ [IRSSI_MODULE_DIR='${libdir}/irssi/modules'])
AC_SUBST(IRSSI_MODULE_DIR)
View
@@ -1,6 +1,6 @@
# The day Irssi will be able to check in $(prefix), this will change. Until
# then, it's hardcoded.
-helpdir = /usr/share/irssi/help
+helpdir = $(datarootdir)/irssi/help
help_DATA = otr
EXTRA_DIST = otr
View
@@ -1,6 +1,6 @@
AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS)
-IRSSI_DIST=/usr/include/irssi
+IRSSI_DIST=$(includedir)/irssi
IRSSI_INCLUDE = -I$(IRSSI_DIST) \
-I$(IRSSI_DIST)/src \
-I$(IRSSI_DIST)/src/fe-common/core \

0 comments on commit 6f6f8f4

Please sign in to comment.