VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

make SCROBBLER_AUTH a Makefile variable instead of hardcoding it into the 

Makefile. This also fixes a build error when said file doesn't exist.
This commit is contained in:
Albert Hopkins 2011-07-07 01:41:28 +00:00
parent 962ae4b1e7
commit 28b6e2584c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
teamplayer/Makefile
View File

@ -19,7 +19,7 @@ preinstall:
$(inroot) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7 $(inroot) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7
$(inroot) eselect python set python2.7 $(inroot) eselect python set python2.7
postinstall: $(post_files) postinstall: $(post_files) $(SCROBBLER_AUTH)
$(inroot) $(EMERGE) -n $(USEPKG) =dev-db/postgresql-server-$(PGVER)* $(inroot) $(EMERGE) -n $(USEPKG) =dev-db/postgresql-server-$(PGVER)*
$(inroot) passwd -d postgres $(inroot) passwd -d postgres
echo 'PG_INITDB_OPTS="--locale=en_US.UTF-8"' >> $(CHROOT)/etc/conf.d/postgresql-$(PGVER) echo 'PG_INITDB_OPTS="--locale=en_US.UTF-8"' >> $(CHROOT)/etc/conf.d/postgresql-$(PGVER)
@ -39,7 +39,9 @@ endif
cp bash_profile $(CHROOT)$(TP_HOME)/.bash_profile cp bash_profile $(CHROOT)$(TP_HOME)/.bash_profile
$(inroot) mkdir -p /etc/teamplayer $(inroot) mkdir -p /etc/teamplayer
$(M4C) settings_local.py > $(CHROOT)/etc/teamplayer/settings_local.py $(M4C) settings_local.py > $(CHROOT)/etc/teamplayer/settings_local.py
test -e '.scrobbler_auth' && cat .scrobbler_auth >> $(CHROOT)/etc/teamplayer/settings_local.py ifdef SCROBBLER_AUTH
cat $(SCROBBLER_AUTH) >> $(CHROOT)/etc/teamplayer/settings_local.py
endif
mkdir -p $(CHROOT)$(TP_HOME)/bin mkdir -p $(CHROOT)$(TP_HOME)/bin
$(M4C) start-teamplayer > $(CHROOT)$(TP_HOME)/bin/start-teamplayer $(M4C) start-teamplayer > $(CHROOT)$(TP_HOME)/bin/start-teamplayer
chmod +x $(CHROOT)$(TP_HOME)/bin/start-teamplayer chmod +x $(CHROOT)$(TP_HOME)/bin/start-teamplayer