@@ -40,25 +40,34 @@ install: install-master install-pydisco install-node install-master: install-config master install -d $(TARGETDIR)/ebin install -d $(TARGETBIN) - cp $(BOOT) $(TARGETDIR) - cp $(APP) $(TARGETDIR)/ebin - cp master/make-lighttpd-proxyconf.py $(TARGETDIR) + install -m 0755 $(BOOT) $(TARGETDIR) + install -m 0755 $(APP) $(TARGETDIR)/ebin + install -m 0755 master/make-lighttpd-proxyconf.py $(TARGETDIR) + install -m 0755 master/disco-master $(TARGETBIN) + cp -r master/www $(TARGETDIR) - cp conf/lighttpd-master.conf $(TARGETCFG) - cp master/disco-master $(TARGETBIN) + chmod -R u=rwX,g=rX,o=rX $(TARGETDIR)/www + + $(if $(TARGETCFG)/lighttpd-master.conf,\ + $(info lighttpd-master config already exists, skipping),\ + install -m 0644 conf/lighttpd-master.conf $(TARGETCFG)) install-node: install-config master install -d $(TARGETDIR)/ebin - cp $(TARGET) $(TARGETDIR)/ebin + install -m 0755 $(TARGET) $(TARGETDIR)/ebin (cd node; $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)) - cp conf/lighttpd-node.conf $(TARGETCFG) + $(if $(TARGETCFG)/lighttpd-node.conf,\ + $(info lighttpd-node config already exists, skipping),\ + install -m 0644 conf/lighttpd-node.conf $(TARGETCFG)) install-pydisco: (cd pydisco; $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)) install-config: install -d $(TARGETCFG) - cp conf/disco.conf.example $(TARGETCFG)/disco.conf + $(if $(TARGETCFG)/disco.conf,\ + $(info disco config already exists, skipping),\ + install -m 0644 conf/disco.conf.example $(TARGETCFG)/disco.conf) $(APP): $(BOOT) Makefile 1ce9c73dcd95386effe119a67416e4928c34a512 Roberto Aguilar roberto.c.aguilar@gmail.com http://github.com/tuulos/disco/commit/fa489bad8dab795693223433ce58fd81e2c85a06 fa489bad8dab795693223433ce58fd81e2c85a06 2009-04-23T20:36:38-07:00 2009-04-23T20:36:38-07:00 Update to Makefile. Set usable permissions so that a non-root user can access needed files. If config files in /etc/disco already exist, don't overwrite them; simply print a message that installing the file has been skipped.. 143b0f19b0cdf101212703a9491ecdeb800bf7ba Roberto Aguilar roberto.c.aguilar@gmail.com