[PATCH] Adjust-path-for-various-Makefile-targets-subfolders

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Please find attached a patch against
git://git.fedorahosted.org/liberation-fonts.git


Cheers,

-- 
Nicolas Spalinger
http://scripts.sil.org
http://pkg-fonts.alioth.debian.org/
https://launchpad.net/people/fonts




From a0b97084999a2c920ab066b4c05b0ef7657b3b89 Mon Sep 17 00:00:00 2001
From: Nicolas Spalinger <nicolas@xxxxxxxxx>
Date: Wed, 14 May 2008 15:17:46 +0200
Subject: [PATCH] Adjust path for various Makefile targets: subfolders with shorter names instead of long ones in the parent folder

---
 Makefile |   91 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 44 insertions(+), 47 deletions(-)
 rewrite Makefile (60%)

diff --git a/Makefile b/Makefile
dissimilarity index 60%
index e972c35..93ed202 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,44 @@
-VER = 1.04
-FONTFORGE = /usr/bin/env fontforge
-
-SRCDIRS = $(shell find -type d | grep -v .git)
-BINDIRS = $(shell find -type d | grep -v .git | grep -v src)
-SRCFILES = $(shell find -type f | grep -v .git)
-SFDFILES = $(shell ls ./src/*.sfd)
-TTFFILES = $(shell ls ./build/ttf/*.ttf)
-BINDOCS = AUTHORS ChangeLog COPYING License.txt README 
-
-all: dist
-
-
-build:
-	$(foreach sfdfile, $(SFDFILES), $(FONTFORGE) -script ./scripts/sfd2ttf.pe $(sfdfile);)
-	mkdir -p build/ttf && mv ./src/*.ttf ./build/ttf/
-
-
-sfd:
-	$(foreach ttffile, $(TTFFILES), $(FONTFORGE) -script ./scripts/ttf2sfd.pe $(ttffile);)
-	mkdir -p build/sfd && mv ./build/ttf/*.sfd ./build/sfd/
-
-
-dist: clean-build build
-	mkdir -p ../liberation-fonts_build/liberation-fonts
-	cp $(TTFFILES) $(BINDOCS) ../liberation-fonts_build/liberation-fonts/
-	mkdir -p ../liberation-fonts_tar
-	cd ../liberation-fonts_build && tar czvf \
-	  ../liberation-fonts_tar/liberation-fonts-$(VER).tar.gz \
-	  liberation-fonts/
-
-src: clean-build
-	mkdir -p ../liberation-fonts_build/liberation-fonts-$(VER)
-	$(foreach tardir, $(SRCDIRS), mkdir -p ../liberation-fonts_build/liberation-fonts-$(VER)/$(tardir);)
-	$(foreach srcfile, $(SRCFILES), cp $(srcfile) ../liberation-fonts_build/liberation-fonts-$(VER)/$(shell dirname $(srcfile))/;)
-	mkdir -p ../liberation-fonts_tar
-	cd ../liberation-fonts_build && tar czvf \
-	  ../liberation-fonts_tar/liberation-fonts-$(VER).src.tar.gz \
-	  liberation-fonts-$(VER)/
-
-
-clean: clean-build
-	rm -rf ../liberation-fonts_tar
-
-clean-build:
-	rm -rf build
-	rm -rf ../liberation-fonts_build
+VER = 1.04
+FONTFORGE = /usr/bin/env fontforge
+
+SRCDIRS = $(shell find -type d | grep -v .git)
+BINDIRS = $(shell find -type d | grep -v .git | grep -v src)
+SRCFILES = $(shell find -type f | grep -v .git)
+SFDFILES = $(shell ls ./src/*.sfd)
+TTFFILES = $(shell ls ./build-area/ttf/*.ttf)
+BINDOCS = AUTHORS ChangeLog COPYING License.txt README 
+
+all: dist
+
+
+build:
+	$(foreach sfdfile, $(SFDFILES), $(FONTFORGE) -script ./scripts/sfd2ttf.pe $(sfdfile);)
+	mkdir -p build-area/ttf && mv ./src/*.ttf ./build-area/ttf/
+
+
+sfd:
+	$(foreach ttffile, $(TTFFILES), $(FONTFORGE) -script ./scripts/ttf2sfd.pe $(ttffile);)
+	mkdir -p build-area/sfd && mv ./build-area/ttf/*.sfd ./build-area/sfd/
+
+
+dist: clean-build build
+	mkdir -p build-area/liberation-fonts-$(VER)
+	cp $(TTFFILES) $(BINDOCS) build-area/liberation-fonts-$(VER)
+	mkdir -p dist
+	cd build-area && tar czvf  ../dist/liberation-fonts-$(VER).tar.gz  liberation-fonts-$(VER)/
+
+src: clean-build
+	mkdir -p build-area/liberation-fonts-$(VER)
+	$(foreach tardir, $(SRCDIRS), mkdir -p build-area/liberation-fonts/liberation-fonts-$(VER)/$(tardir);)
+	$(foreach srcfile, $(SRCFILES), cp $(srcfile) build-area/liberation-fonts/liberation-fonts-$(VER)/$(shell dirname $(srcfile))/;)
+	mkdir -p dist
+	cd build-area && tar czvf \
+	  ../dist/liberation-fonts-$(VER).src.tar.gz \
+	  liberation-fonts-$(VER)/
+
+
+clean: clean-build
+	rm -rf dist
+
+clean-build:
+	rm -rf build-area
-- 
1.5.4.3

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Fedora-fonts-list mailing list
Fedora-fonts-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-fonts-list

[Index of Archives]     [Fedora Users]     [Font Configuration]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite Forum]     [KDE Users]

  Powered by Linux