From 64d2c31c902439eb0e62471fe97086bf217e7926 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Sun, 24 May 2009 04:09:58 +1000 Subject: Follow-up on recent XML config file rename --- Makefile | 2 +- src/config.h | 4 ++-- src/setup-dbg.py | 2 +- src/setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a0299c3..48f3132 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ vpath %.c $(SRC_D) vpath %.h $(SRC_D) vpath % $(OBJ_D) -ifeq (0,0) +ifeq (0,1) TEMP: sudo make install sudo python -c 'import dmidecode; print "-"*80; print dmidecode.slot(); print "-"*80; print dmidecode.type(9)' diff --git a/src/config.h b/src/config.h index 8eb38ad..4fd5f41 100644 --- a/src/config.h +++ b/src/config.h @@ -24,11 +24,11 @@ #endif #ifndef PYTHON_XML_MAP -#define PYTHON_XML_MAP "/usr/share/python-dmidecode/pythonmap.xml" +#define PYTHON_XML_MAP "/usr/share/python-dmidecode/py-map.xml" #endif #ifndef PYTHON_XML_TYPEMAP -#define PYTHON_XML_TYPEMAP "/usr/share/python-dmidecode/typemap.xml" +#define PYTHON_XML_TYPEMAP "/usr/share/python-dmidecode/py-typemap.xml" #endif #endif diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 0b7a2ed..988c3f3 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -8,7 +8,7 @@ setup( author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", url = "http://projects.autonomy.net.au/python-dmidecode/", - data_files = [ ('share/python-dmidecode-dbg', ['src/pythonmap.xml']) ], + data_files = [ ('share/python-dmidecode-dbg', ['src/py-map.xml', 'src/py-typemap.xml']) ], ext_modules = [ Extension( "dmidecode", diff --git a/src/setup.py b/src/setup.py index f9904af..dde35eb 100644 --- a/src/setup.py +++ b/src/setup.py @@ -8,7 +8,7 @@ setup( author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", url = "http://projects.autonomy.net.au/python-dmidecode/", - data_files = [ ('share/python-dmidecode', ['src/pythonmap.xml']) ], + data_files = [ ('share/python-dmidecode', ['src/py-map.xml', 'src/py-typemap.xml']) ], ext_modules = [ Extension( "dmidecode", -- cgit