diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:30:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:30:34 -0400 |
| commit | 5160041df9dbaa69d40e792bac896d3f4da1d14f (patch) | |
| tree | a4fbee644c8dba56d6810ba2cb7b961be5b6c387 | |
| parent | eff0fe5dffaf387771042f8584501219d98bbbf2 (diff) | |
| parent | 4766442124483e6c0965f02e6a2f19ce0cb962be (diff) | |
Merge branch 'joeyconfig'
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -23,9 +23,9 @@ install: install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor mkdir -p dist/gittmp - $(CABAL) sdist - tar tf dist/propellor-*.tar.gz | perl -ne 's!propellor-[^/]+/!!; print unless $$_ eq "\n"' > dist/list-sources - tar c -T dist/list-sources | (cd dist/gittmp && tar x) + $(CABAL) sdist | (cd dist/gittmp && tar x --strip-components=1) + # cabal sdist does not preserve symlinks, so copy over file + cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done cd dist/gittmp && git init && \ git add . \ && git commit -q -m "distributed version of propellor" \ |