diff options
| author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-06-24 21:29:41 +0000 |
|---|---|---|
| committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-06-24 21:29:41 +0000 |
| commit | e3c27bc637bfab6593cdaf80b4e8b82a07a4bfb3 (patch) | |
| tree | 9df69fb7fb93dce046293c9bac6bb7be52b8c8b5 | |
| parent | b09c92877f3403bc963dcc9ad2ba7e400efeb7b2 (diff) | |
| download | bcfg2-e3c27bc637bfab6593cdaf80b4e8b82a07a4bfb3.tar.gz bcfg2-e3c27bc637bfab6593cdaf80b4e8b82a07a4bfb3.tar.bz2 bcfg2-e3c27bc637bfab6593cdaf80b4e8b82a07a4bfb3.zip | |
EncapPackages: Fix where server stuff goes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3344 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | encap/src/encap-profiles/server/Makefile | 21 | ||||
| l--------- | encap/src/encap-profiles/server/ep2target | 1 |
2 files changed, 4 insertions, 18 deletions
diff --git a/encap/src/encap-profiles/server/Makefile b/encap/src/encap-profiles/server/Makefile index 2785a0426..9390b688d 100644 --- a/encap/src/encap-profiles/server/Makefile +++ b/encap/src/encap-profiles/server/Makefile @@ -1,8 +1,8 @@ # $Id$ -.PHONY : test log all install clean distclean uninstall encaps rename bcfg2only bcfg2bump +.PHONY : test log all install clean distclean encaps rename .SUFFIXES : -.SUFFIXES : .ep .sh .installed .packaged .d +.SUFFIXES : .ep .installed .packaged .d export BASEDIR = /usr/local export ENCAPDIR := ${BASEDIR}/encap @@ -10,7 +10,7 @@ export EPKG := ${BASEDIR}/bin/epkg export MKENCAP := ${BASEDIR}/bin/mkencap export SHELL = /bin/sh srcdir = . -export EP2TARGET := $(srcdir)/../ep2target +export EP2TARGET := $(srcdir)/ep2target PAGER ?= more BCFG2_CHEETAH_DOC := $(basename $(wildcard bcfg2-cheetah-doc-*.ep)) @@ -37,16 +37,6 @@ sources := $(BCFG2_CHEETAH_DOC) $(BCFG2_GAMIN) $(BCFG2_GLIB) $(BCFG2_LIBXML2) $( touch ./$*.installed @printf "***** STOP .ep.installed for |$*| ***** \n" -%.installed : %.sh # Create and install a "fake" encap package - @printf "***** START .sh.installed for |$*| ***** \n" - -$(EPKG) -q -r $(ENCAPDIR)/$* - -rm -rf $(ENCAPDIR)/$* - chmod 755 $(srcdir)/$*.sh && $(srcdir)/$*.sh - $(EPKG) -q -i $(ENCAPDIR)/$* - test -h $(BASEDIR)/var/encap/$* - touch ./$*.installed - @printf "***** STOP .sh.installed for |$*| ***** \n" - %.packaged : %.installed # Create .tar.gz encap packages @printf "***** START .installed.packaged for |$*| ***** \n" -rm $(ENCAPDIR)/$*-*.tar.gz @@ -61,11 +51,6 @@ sources := $(BCFG2_CHEETAH_DOC) $(BCFG2_GAMIN) $(BCFG2_GLIB) $(BCFG2_LIBXML2) $( chmod 755 $(EP2TARGET) && $(EP2TARGET) $< > $@ @printf "***** STOP .d.ep for |$*| ***** \n" -%.d : %.sh # Create dependancy files from .sh files - @printf "***** START .d.sh for |$*| ***** \n" - chmod 755 $(EP2TARGET) && $(EP2TARGET) $< > $@ - @printf "***** STOP .d.sh for |$*| ***** \n" - log : ( $(MAKE) install > ./make.log 2>&1 \ && $(MAKE) encaps >> ./make.log 2>&1 \ diff --git a/encap/src/encap-profiles/server/ep2target b/encap/src/encap-profiles/server/ep2target new file mode 120000 index 000000000..6a7aaa552 --- /dev/null +++ b/encap/src/encap-profiles/server/ep2target @@ -0,0 +1 @@ +../ep2target
\ No newline at end of file |