Merge pull request #36 from petterreinholdtsen/master

Make sure 'make all' do not need privileges, and 'make install'
This commit is contained in:
Nick Daly 2013-10-07 14:51:36 -07:00
commit 49046c0074

View File

@ -13,7 +13,7 @@ DATADIR=/usr/share/plinth
PYDIR=$(DATADIR)/python/plinth PYDIR=$(DATADIR)/python/plinth
## Catch-all tagets ## Catch-all tagets
default: config dirs template css docs dbs apache-config default: config dirs template css docs dbs
all: default all: default
predepend: predepend:
@ -22,7 +22,7 @@ predepend:
git submodule update git submodule update
touch predepend touch predepend
install: default install: default apache-install
mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/etc/plinth mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/etc/plinth
cp plinth.sample.fhs.config $(DESTDIR)/etc/plinth/plinth.config cp plinth.sample.fhs.config $(DESTDIR)/etc/plinth/plinth.config
mkdir -p $(DESTDIR)$(PYDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)/usr/bin \ mkdir -p $(DESTDIR)$(PYDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)/usr/bin \
@ -93,8 +93,9 @@ current-checkout.tar.gz: $(ALL_BUT_GZ)
current-repository.tar.gz: $(ALL_BUT_GZ) current-repository.tar.gz: $(ALL_BUT_GZ)
tar cz $(EXCLUDE) * .git > current-repository.tar.gz tar cz $(EXCLUDE) * .git > current-repository.tar.gz
apache-config: apache-ssl apache-install:
cp share/apache/plinth.conf /etc/apache/sites-available/plinth.conf install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf
apache-config: apache-install apache-ssl
a2ensite plinth a2ensite plinth
apache-ssl: apache-ssl: