I've looked over the entire patch set and it looks good to me, ack.
On 03/31/2010 08:43 PM, Chris Lumens wrote:
You know, like anaconda's any other python module.
---
Makefile.am | 7 ++-----
anaconda.spec.in | 5 ++---
booty/Makefile.am | 2 +-
installclasses/Makefile.am | 2 +-
isys/Makefile.am | 5 +----
iw/Makefile.am | 2 +-
storage/Makefile.am | 2 +-
storage/devicelibs/Makefile.am | 2 +-
storage/formats/Makefile.am | 2 +-
textw/Makefile.am | 2 +-
10 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5a1622a..94a1297 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,13 +42,10 @@ dist_sbin_SCRIPTS = anaconda
udevdir = /lib/udev/rules.d
dist_udev_DATA = 70-anaconda.rules
-langdir = $(libdir)/$(PACKAGE_NAME)
+langdir = $(datadir)/$(PACKAGE_NAME)
lang_DATA = lang-names
dist_lang_DATA = lang-table
-pkgpyexecdir = $(libdir)/$(PACKAGE_NAME)
-pkgpythondir = $(libdir)/$(PACKAGE_NAME)
-
pkgpyexec_LTLIBRARIES = xutils.la
xutils_la_CFLAGS = $(PYTHON_INCLUDES) $(GDK_CFLAGS) -fno-strict-aliasing
xutils_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(GDK_LDFLAGS)
@@ -56,7 +53,7 @@ xutils_la_LIBADD = $(PYTHON_LIBS) $(GDK_LIBS)
xutils_la_SOURCES = xutils.c
# anaconda Python code
-anacondadir = $(libdir)/$(PACKAGE_NAME)
+anacondadir = $(pkgpyexecdir)
anaconda_PYTHON = *.py
PYCHECKERPATH = isys:textw:iw:installclasses:/usr/share/system-config-date
diff --git a/anaconda.spec.in b/anaconda.spec.in
index a52292c..b48ebf7 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -1,5 +1,4 @@
%define livearches %{ix86} x86_64 ppc ppc64
-%define _libdir %{_prefix}/lib
Summary: Graphical system installer
Name: anaconda
@@ -208,9 +207,9 @@ update-desktop-database&> /dev/null || :
%{_sbindir}/showpart
%endif
%{_datadir}/anaconda
-%{_prefix}/lib/anaconda
-%{_prefix}/lib/anaconda-runtime
%{_prefix}/libexec/anaconda
+%{_libdir}/python*/site-packages/anaconda/*
+%{_libdir}/anaconda*
%ifarch %livearches
%{_bindir}/liveinst
%{_sbindir}/liveinst
diff --git a/booty/Makefile.am b/booty/Makefile.am
index 7cfc29f..ee7d11f 100644
--- a/booty/Makefile.am
+++ b/booty/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-bootydir = $(libdir)/$(PACKAGE_NAME)/booty
+bootydir = $(pkgpyexecdir)/booty
booty_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/installclasses/Makefile.am b/installclasses/Makefile.am
index 0b8ddd2..e45bcc5 100644
--- a/installclasses/Makefile.am
+++ b/installclasses/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-installclassesdir = $(libdir)/$(PACKAGE_NAME)/installclasses
+installclassesdir = $(pkgpyexecdir)/installclasses
installclasses_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/isys/Makefile.am b/isys/Makefile.am
index f40a884..2600104 100644
--- a/isys/Makefile.am
+++ b/isys/Makefile.am
@@ -30,12 +30,9 @@ ISYS_LIBS = $(RESOLV_LIBS) $(EXT2FS_LIBS) $(ZLIB_LIBS) \
$(DEVMAPPER_LIBS) $(BLKID_LIBS) $(X11_LIBS) $(SELINUX_LIBS) \
$(LIBNL_LIBS) $(LIBNM_GLIB_LIBS)
-isysdir = $(libdir)/$(PACKAGE_NAME)
+isysdir = $(pkgpyexecdir)
isys_PYTHON = *.py
-pkgpyexecdir = $(libdir)/$(PACKAGE_NAME)
-pkgpythondir = $(libdir)/$(PACKAGE_NAME)
-
pkgpyexec_LTLIBRARIES = _isys.la
_isys_la_CFLAGS = $(PYTHON_INCLUDES) $(ISYS_CFLAGS)
_isys_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
diff --git a/iw/Makefile.am b/iw/Makefile.am
index db5938b..0ab4890 100644
--- a/iw/Makefile.am
+++ b/iw/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-iwdir = $(libdir)/$(PACKAGE_NAME)/iw
+iwdir = $(pkgpyexecdir)/iw
iw_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/storage/Makefile.am b/storage/Makefile.am
index 18b418c..8e2c6fc 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-storagedir = $(libdir)/$(PACKAGE_NAME)/storage
+storagedir = $(pkgpyexecdir)/storage
storage_PYTHON = *.py
SUBDIRS = devicelibs formats
diff --git a/storage/devicelibs/Makefile.am b/storage/devicelibs/Makefile.am
index 90076bf..a1e3c88 100644
--- a/storage/devicelibs/Makefile.am
+++ b/storage/devicelibs/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-storagedevicelibsdir = $(libdir)/$(PACKAGE_NAME)/storage/devicelibs
+storagedevicelibsdir = $(pkgpyexecdir)/storage/devicelibs
storagedevicelibs_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/storage/formats/Makefile.am b/storage/formats/Makefile.am
index 5af707d..b24eaa1 100644
--- a/storage/formats/Makefile.am
+++ b/storage/formats/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-storageformatsdir = $(libdir)/$(PACKAGE_NAME)/storage/formats
+storageformatsdir = $(pkgpyexecdir)/storage/formats
storageformats_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/textw/Makefile.am b/textw/Makefile.am
index fcc423c..b1c320d 100644
--- a/textw/Makefile.am
+++ b/textw/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
-textwdir = $(libdir)/$(PACKAGE_NAME)/textw
+textwdir = $(pkgpyexecdir)/textw
textw_PYTHON = *.py
MAINTAINERCLEANFILES = Makefile.in
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
