[spin-kickstarts] The doc directory is versioned
by Bruno Wolff III
commit 5149abf0f9f2435c1fc81aa328a3490d3cb89eb1
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 15:30:55 2013 -0500
The doc directory is versioned
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index 7f4dc8f..b4de337 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ install:
install *.ks* $(DATADIR)/$(name)
install custom/* $(DATADIR)/$(name)/custom
install l10n/* $(DATADIR)/$(name)/l10n
- install AUTHORS COPYING README $(DOCDIR)/$(name)
+ install AUTHORS COPYING README $(DOCDIR)/$(name)-$(version)
clean:
rm -f $(name)-*.tar.gz
10 years, 9 months
[spin-kickstarts] Missing wildcard instances causes a problem
by Bruno Wolff III
commit 15a9a14dff223ade7c69b2cfcc090b22a4a0f16e
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 15:17:50 2013 -0500
Missing wildcard instances causes a problem
Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile b/Makefile
index 2d97c58..7f4dc8f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,9 @@ name := spin-kickstarts
all: dist
install:
- install *{.ks,.ks.in} $(DATADIR)/$(name)
- install custom/*{.ks,.ks.in} $(DATADIR)/$(name)/custom
- install l10n/*{.ks,.ks.in} $(DATADIR)/$(name)/l10n
+ install *.ks* $(DATADIR)/$(name)
+ install custom/* $(DATADIR)/$(name)/custom
+ install l10n/* $(DATADIR)/$(name)/l10n
install AUTHORS COPYING README $(DOCDIR)/$(name)
clean:
10 years, 9 months
[spin-kickstarts] Fix install target
by Bruno Wolff III
commit 629a71433c624de87341589474d10fc83191dc73
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 14:59:42 2013 -0500
Fix install target
Installing a mix of directories and files on the same install
command doesn't work.
Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index 888ba30..2d97c58 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ name := spin-kickstarts
all: dist
install:
- install *.ks custom l10n $(DATADIR)/$(name)
+ install *{.ks,.ks.in} $(DATADIR)/$(name)
+ install custom/*{.ks,.ks.in} $(DATADIR)/$(name)/custom
+ install l10n/*{.ks,.ks.in} $(DATADIR)/$(name)/l10n
install AUTHORS COPYING README $(DOCDIR)/$(name)
clean:
10 years, 9 months
[spin-kickstarts] Use DESTDIR instead of prefix
by Bruno Wolff III
commit e2a8980beea679697766694d1d328e917edf3516
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 14:45:41 2013 -0500
Use DESTDIR instead of prefix
Makefile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile b/Makefile
index a6b9c67..888ba30 100644
--- a/Makefile
+++ b/Makefile
@@ -5,19 +5,19 @@ ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
endif
-prefix := /usr
+DESTDIR := /usr
-datadir := $(prefix)/share
+DATADIR := $(DESTDIR)/share
-docdir := $(datadir)/doc/
+DOCDIR := $(DATADIR)/doc/
name := spin-kickstarts
all: dist
install:
- install *.ks custom l10n $(datadir)/$(name)
- install AUTHORS COPYING README $(docdir)/$(name)
+ install *.ks custom l10n $(DATADIR)/$(name)
+ install AUTHORS COPYING README $(DOCDIR)/$(name)
clean:
rm -f $(name)-*.tar.gz
10 years, 9 months
[spin-kickstarts] Add an install target to the make file
by Bruno Wolff III
commit 89d097db42303d6d68cb2cf640f7cb15aded62a9
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 14:37:50 2013 -0500
Add an install target to the make file
The fedora package uses make install, and it is easier to support that
here rather than in the spec file.
Makefile | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/Makefile b/Makefile
index 8762c35..a6b9c67 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,28 @@ ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
endif
+prefix := /usr
+
+datadir := $(prefix)/share
+
+docdir := $(datadir)/doc/
+
+name := spin-kickstarts
+
all: dist
+install:
+ install *.ks custom l10n $(datadir)/$(name)
+ install AUTHORS COPYING README $(docdir)/$(name)
+
clean:
- rm -f spin-kickstarts-*.tar.gz
+ rm -f $(name)-*.tar.gz
dist:
- git archive --format=tar --prefix=spin-kickstarts-$(version)/ HEAD | gzip > spin-kickstarts-$(version).tar.gz
+ git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz
publish:
- scp spin-kickstarts-$(version).tar.gz fedorahosted.org:spin-kickstarts
+ scp $(name)-$(version).tar.gz fedorahosted.org:$(name)
dist-clean:
git clean -f -d
10 years, 9 months