diff options
author | James Vasile <james@jamesvasile.com> | 2013-02-07 11:30:37 -0500 |
---|---|---|
committer | James Vasile <james@jamesvasile.com> | 2013-02-07 11:30:37 -0500 |
commit | 65fe8434e334f7f695814078d1c9441462737b44 (patch) | |
tree | ff1c901a6ad91fe3deec9987634e6347f254e26f | |
parent | 9501204fccce62a5a94fa44a503041478ce13827 (diff) |
Fix paths in installed version
* Read python.config from script dir
* Make dirs for pid and run
Maybe making DESTDIR/var/run during make install is not needed because
we can expect the target system to have /var/run, but if it's missing
the CherryPy engine will fail when it tries to write the pid. So I
added it.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cfg.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -46,7 +46,7 @@ install: default cp share/init.d/plinth $(DESTDIR)/etc/init.d rm -f $(DESTDIR)/usr/bin/plinth ln -s ../lib/python2.7/plinth/plinth.py $(DESTDIR)/usr/bin/plinth - mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions + mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run cp -r data/* $(DESTDIR)/var/lib/plinth rm -f $(DESTDIR)/var/lib/plinth/users/sqlite3.distrib @@ -18,7 +18,7 @@ parser = SafeConfigParser( 'pidfile':"", 'port':"", }) -parser.read('plinth.config') +parser.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'plinth.config')) product_name = parser.get('Name', 'product_name') box_name = parser.get('Name', 'box_name') |