docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102 from fkautz/master 

Some minor cleanup of cleanup in Makefile
This commit is contained in:
Solomon Hykes 2013-03-19 10:07:21 -07:00
parent 33c2f07fc7 6316b99556
commit c5051ea0ea
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -14,7 +14,7 @@ TMPDIR=$(shell mktemp -d -t XXXXXX)
# Build a debian source package # Build a debian source package
all: build_in_deb all: clean build_in_deb
build_in_deb: build_in_deb:
echo "GOPATH = " $(ROOT_PATH) echo "GOPATH = " $(ROOT_PATH)
@ -29,7 +29,7 @@ install:
install -m 0755 bin/docker $(DESTDIR)/$(INSDIR) install -m 0755 bin/docker $(DESTDIR)/$(INSDIR)
install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf
$(BUILD_SRC): cleanup $(BUILD_SRC): clean
# Copy ourselves into $BUILD_SRC to comply with unusual golang constraints # Copy ourselves into $BUILD_SRC to comply with unusual golang constraints
tar --exclude=*.tar.gz --exclude=checkout.tgz -f checkout.tgz -cz * tar --exclude=*.tar.gz --exclude=checkout.tgz -f checkout.tgz -cz *
mkdir -p $(BUILD_SRC)/$(GITHUB_PATH) mkdir -p $(BUILD_SRC)/$(GITHUB_PATH)
@ -79,6 +79,5 @@ gotest:
done done
@sudo rm -rf /tmp/docker-* @sudo rm -rf /tmp/docker-*
cleanup: clean:
rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz bin
rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz