Merge pull request #66 from chu11/distutils_2_setuptools

extensions: use setuptools over distutils
chaos · Aug 19, 2024 · 9bf4610 · 9bf4610
2 parents 2824c2c + 46ed75d
commit 9bf4610
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/extensions/python/Makefile.am b/src/extensions/python/Makefile.am
@@ -17,13 +17,13 @@ all: genderssetup.py libgendersmodule.c genders.py
 	$(PYTHON) genderssetup.py build
 
 install:
-	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 pure_install:
-	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 install-data-local:
-	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 clean: 
 	rm -rf build

diff --git a/src/extensions/python/Makefile.in b/src/extensions/python/Makefile.in
@@ -489,13 +489,13 @@ uninstall-am:
 @WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py build
 
 @WITH_PYTHON_EXTENSIONS_TRUE@install:
-@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 @WITH_PYTHON_EXTENSIONS_TRUE@pure_install:
-@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 @WITH_PYTHON_EXTENSIONS_TRUE@install-data-local:
-@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
+@WITH_PYTHON_EXTENSIONS_TRUE@	$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
 
 @WITH_PYTHON_EXTENSIONS_TRUE@clean: 
 @WITH_PYTHON_EXTENSIONS_TRUE@	rm -rf build

diff --git a/src/extensions/python/genderssetup.py.in b/src/extensions/python/genderssetup.py.in
@@ -1,4 +1,4 @@
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
 libgendersmodule = Extension('libgenders',
                              include_dirs = ['../../../config', '../../libgenders'],