Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Attempt 2 to fix eucadmin install paths

  • Loading branch information...
commit ece098e6a3b82c92684d9f4c5d433a61ef88a0a6 2 parents f95e2e9 + 5ed1416
@gholms gholms authored
View
14 clc/eucadmin/Makefile
@@ -19,23 +19,25 @@
# if you need additional information or have any questions.
#
###############################################################################
-# Author: Chris Grzegorczyk grze@eucalyptus.com
-###############################################################################
include ../../Makedefs
+ifndef DESTDIR
+ DESTDIR := /
+endif
+
all: euca_admin
build: euca_admin
euca_admin:
- @cat setup.cfg.template | sed "s:DESTDIR:$(DESTDIR):" > setup.cfg
+ @sed -e 's://*:/:g' setup.cfg.template > setup.cfg
$(PYTHON) setup.py build
install: euca_admin
- @cat setup.cfg.template | sed "s:DESTDIR:$(DESTDIR):" > setup.cfg
- $(PYTHON) setup.py install
+ @sed -e 's://*:/:g' setup.cfg.template > setup.cfg
+ $(PYTHON) setup.py install --root=$(DESTDIR)
clean:
- @$(RM) -fr ./dist
+ @$(RM) -fr ./dist ./build
distclean: clean
View
2  clc/eucadmin/setup.cfg.template.in
@@ -1,3 +1,3 @@
[install]
-install_scripts=DESTDIR/@prefix@/usr/sbin
+install_scripts=@prefix@/usr/sbin
prefix=@prefix@/usr
View
2  clc/eucadmin/setup.py
@@ -41,7 +41,7 @@
class build_scripts_with_path_headers(build_scripts):
def run(self):
build_scripts.run(self)
- self.path_header = get_python_lib(prefix=prefix)
+ self.path_header = get_python_lib(prefix=prefix).replace('dist-packages', 'site-packages')
self.outfiles = [os.path.join(self.build_dir, os.path.basename(script))
for script in self.distribution.scripts]
self.add_paths_to_scripts()
Please sign in to comment.
Something went wrong with that request. Please try again.