projects
/
oweals
/
hwdata.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a52b414
)
more dist fixes
author
Karsten Hopp
<karsten@redhat.com>
Fri, 28 Jan 2011 16:50:39 +0000
(17:50 +0100)
committer
Karsten Hopp
<karsten@redhat.com>
Fri, 28 Jan 2011 16:50:39 +0000
(17:50 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 8b0b045afca23734e1341cb538ba31dd29f4a3dc..b5f868aabd4f0def04450ac1129bd8ba00f33627 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,7
@@
NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
RELEASE=$(shell awk '/Release:/ { a=$$2; sub("%.*","",a); print a }' hwdata.spec)
NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
RELEASE=$(shell awk '/Release:/ { a=$$2; sub("%.*","",a); print a }' hwdata.spec)
+RELVER=$(shell awk '/define relver/ { print $3 }' hwdata.spec)
SOURCEDIR := $(shell pwd)
prefix=$(DESTDIR)/usr
SOURCEDIR := $(shell pwd)
prefix=$(DESTDIR)/usr
@@
-56,21
+57,21
@@
check:
@[ `grep -vc ' ' videodrivers` -eq 0 ] || { echo "FAILURE: videodrivers not TAB separated"; exit 1; } && echo "OK: videodrivers"
create-archive:
@[ `grep -vc ' ' videodrivers` -eq 0 ] || { echo "FAILURE: videodrivers not TAB separated"; exit 1; } && echo "OK: videodrivers"
create-archive:
- @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar* 2>/dev/null
+ @rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION)
-$(RELVER)
.tar* 2>/dev/null
@make changelog
@make changelog
- @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(REL
EASE
).tar
+ @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(REL
VER
).tar
@mkdir $(NAME)-$(VERSION)
@cp ChangeLog $(NAME)-$(VERSION)/
@mkdir $(NAME)-$(VERSION)
@cp ChangeLog $(NAME)-$(VERSION)/
- @tar --append -f $(NAME)-$(VERSION)-$(REL
EASE
).tar $(NAME)-$(VERSION)
- @bzip2 -f $(NAME)-$(VERSION)-$(REL
EASE
).tar
+ @tar --append -f $(NAME)-$(VERSION)-$(REL
VER
).tar $(NAME)-$(VERSION)
+ @bzip2 -f $(NAME)-$(VERSION)-$(REL
VER
).tar
@rm -rf $(NAME)-$(VERSION)
@echo ""
@rm -rf $(NAME)-$(VERSION)
@echo ""
- @echo "The final archive is in $(NAME)-$(VERSION)-$(REL
EASE
).tar.bz2"
+ @echo "The final archive is in $(NAME)-$(VERSION)-$(REL
VER
).tar.bz2"
archive: check clean commit tag create-archive
upload:
archive: check clean commit tag create-archive
upload:
- @scp ${NAME}-$(VERSION).tar.bz2 fedorahosted.org:$(NAME)
+ @scp ${NAME}-$(VERSION)
-$(RELVER)
.tar.bz2 fedorahosted.org:$(NAME)
dummy:
dummy: