diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 29d2613..282c7a4 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -114,7 +114,7 @@ nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
_Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version
_Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la
-_Hamlib_ladir = $(pythondir)
+_Hamlib_ladir = $(pyexecdir)
all-py: $(python_ltlib)
diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index 88798b5..fb2c203 100644
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -91,7 +91,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(hamlibtcl_ladir)"
+ "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(hamlibtcl_ladir)"
LTLIBRARIES = $(_Hamlib_la_LTLIBRARIES) $(lib_LTLIBRARIES)
@ENABLE_PYTHON_TRUE@_Hamlib_la_DEPENDENCIES = \
@ENABLE_PYTHON_TRUE@ $(top_builddir)/src/libhamlib.la
@@ -364,7 +364,7 @@ AM_CFLAGS = -fno-strict-aliasing
@ENABLE_PYTHON_TRUE@nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
@ENABLE_PYTHON_TRUE@_Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version
@ENABLE_PYTHON_TRUE@_Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la
-@ENABLE_PYTHON_TRUE@_Hamlib_ladir = $(pythondir)
+@ENABLE_PYTHON_TRUE@_Hamlib_ladir = $(pyexecdir)
@ENABLE_PYTHON_TRUE@python_PYTHON = Hamlib.py
@ENABLE_PYTHON_TRUE@_Hamlib_la_LTLIBRARIES = $(python_ltlib)
@@ -519,8 +519,8 @@ clean-libtool:
-rm -rf .libs _libs
install-pythonPYTHON: $(python_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
- @list='$(python_PYTHON)'; dlist=; list2=; test -n "$(pythondir)" || list=; \
+ test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
+ @list='$(python_PYTHON)'; dlist=; list2=; test -n "$(pyexecdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
@@ -531,30 +531,30 @@ install-pythonPYTHON: $(python_PYTHON)
done; \
for file in $$list2; do echo $$file; done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythondir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pythondir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pyexecdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pyexecdir)" || exit $$?; \
done || exit $$?; \
if test -n "$$dlist"; then \
if test -z "$(DESTDIR)"; then \
- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
else \
- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
fi; \
else :; fi
uninstall-pythonPYTHON:
@$(NORMAL_UNINSTALL)
- @list='$(python_PYTHON)'; test -n "$(pythondir)" || list=; \
+ @list='$(python_PYTHON)'; test -n "$(pyexecdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
filesc=`echo "$$files" | sed 's|$$|c|'`; \
fileso=`echo "$$files" | sed 's|$$|o|'`; \
- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pythondir)" && rm -f $$files || exit $$?; \
- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$filesc ")"; \
- cd "$(DESTDIR)$(pythondir)" && rm -f $$filesc || exit $$?; \
- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$fileso ")"; \
- cd "$(DESTDIR)$(pythondir)" && rm -f $$fileso
+ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$files || exit $$?; \
+ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$filesc ")"; \
+ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$filesc || exit $$?; \
+ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$fileso ")"; \
+ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$fileso
install-hamlibtcl_laDATA: $(hamlibtcl_la_DATA)
@$(NORMAL_INSTALL)
test -z "$(hamlibtcl_ladir)" || $(MKDIR_P) "$(DESTDIR)$(hamlibtcl_ladir)"
@@ -664,7 +664,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) all-local
installdirs:
- for dir in "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(hamlibtcl_ladir)"; do \
+ for dir in "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(hamlibtcl_ladir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)