--- Makefile.am.orig	2007-12-24 21:09:44.000000000 -0800
+++ Makefile.am	2015-04-29 16:13:07.000000000 -0700
@@ -22,7 +22,7 @@
 
 bin_SCRIPTS = xgsch2pcb
 
-pkglib_PYTHON = lib/xgsch2pcb/pcbmanager.py \
+pkgpython_PYTHON = lib/xgsch2pcb/pcbmanager.py \
  lib/xgsch2pcb/gsch2pcbproject.py \
  lib/xgsch2pcb/gui.py \
  lib/xgsch2pcb/new_project_gui.py \
@@ -30,7 +30,7 @@
  lib/xgsch2pcb/templates.py \
  lib/xgsch2pcb/funcs.py
 
-nodist_pkglib_PYTHON = config.py
+nodist_pkgpython_PYTHON = config.py
 
 INTLTOOL_FILES = intltool-extract.in \
                  intltool-merge.in \
@@ -53,11 +53,11 @@
 do_subst = sed -e 's,[@]prefix[@],$(prefix),g' \
                -e 's,[@]PYTHON[@],$(PYTHON),g' \
 				       -e 's,[@]VERSION[@],$(VERSION),g' \
-							 -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
+							 -e 's,[@]pkglibdir[@],$(pkgpythondir),g' \
 							 -e 's,[@]templatesdir[@],$(templatesdir),g' \
 							 -e 's,[@]PACKAGE[@],$(PACKAGE),g'
 
-all: $(pkglib_PYTHON) $(nodist_pkglib_PYTHON)
+all: $(pkgpython_PYTHON) $(nodist_pkgpython_PYTHON)
 
 config.py: lib/xgsch2pcb/config.py.in Makefile
 	$(do_subst) < $(srcdir)/lib/xgsch2pcb/config.py.in > $@