[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: gideal: version 0.9.7; repair Makefile.sub; remove GPL2 a
From: |
Bernd Warken |
Subject: |
[groff] 01/01: gideal: version 0.9.7; repair Makefile.sub; remove GPL2 as in original file |
Date: |
Sat, 06 Sep 2014 19:23:47 +0000 |
bwarken pushed a commit to branch master
in repository groff.
commit 3384acb8ad1f845ce16fccc143f2538d5710f508
Author: Bernd Warken <address@hidden>
Date: Sat Sep 6 21:22:31 2014 +0200
gideal: version 0.9.7; repair Makefile.sub; remove GPL2 as in original file
---
contrib/gideal/Makefile.sub | 57 +++++++++++++++++------------
contrib/gideal/files/opaque_MIT.ideal.ms | 18 ---------
contrib/gideal/gideal.pl | 2 +-
3 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/contrib/gideal/Makefile.sub b/contrib/gideal/Makefile.sub
index a7dd26b..41f3d3e 100644
--- a/contrib/gideal/Makefile.sub
+++ b/contrib/gideal/Makefile.sub
@@ -24,9 +24,19 @@
########################################################################
MAN1=gideal.n
-
MAN7=ideal.n
+FILES=opaque_MIT.ideal.ms \
+ test.groff \
+ README.txt
+
+LIBFILES=arc.ideal \
+ arrow.ideal \
+ dash.ideal \
+ rect.ideal \
+ wavy.ideal \
+ README.txt
+
MOSTLYCLEANADD=gideal $(MAN1) $(MAN7)
# not all make programs have $(RM) predefined.
@@ -39,6 +49,7 @@ gideal: gideal.pl
-e "s|@g@|$(g)|g" \
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-e "s|@VERSION@|$(version)$(revision)|g" \
+ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-e "$(SH_SCRIPT_SED_CMD)" \
$(srcdir)/gideal.pl >$@; \
chmod +x $@
@@ -48,39 +59,37 @@ install_data: gideal
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
$(RM) $(DESTDIR)$(bindir)/gideal
$(INSTALL_SCRIPT) gideal $(DESTDIR)$(bindir)/gideal
- -test -d $(DESTDIR)$(datasubdir) \
- || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
- -test -d $(DESTDIR)$(datasubdir)/ideal \
- || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal
- -test -d $(DESTDIR)$(datasubdir)/ideal/libfiles \
- || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal/libfiles
- $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
- for i in $(srcdir)/libfiles/*; do \
- n=`echo $$i | sed 's|$(srcdir)/libfiles/||g'`; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(datasubdir)/ideal/libfiles/$$n; \
- done
-test -d $(DESTDIR)$(exampledir) \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)
-test -d $(DESTDIR)$(exampledir)/ideal \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)/ideal
- -test -d $(DESTDIR)$(exampledir)/ideal/files \
- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/ideal/files
- $(RM) $(DESTDIR)$(exampledir)/ideal/files/*
- for i in $(srcdir)/files/*; do \
- n=`echo $$i | sed 's|$(srcdir)/files/||g'`; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/ideal/files/$$n; \
+ for f in $(FILES); do \
+ $(RM) $(DESTDIR)$(exampledir)/ideal/$$f; \
+ $(INSTALL_DATA) $(srcdir)/files/$$f \
+ $(DESTDIR)$(exampledir)/ideal/$$f; \
+ done
+ -test -d $(DESTDIR)$(datasubdir) \
+ || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
+ -test -d $(DESTDIR)$(datasubdir)/ideal \
+ || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal
+ for f in $(LIBFILES); do \
+ $(RM) $(DESTDIR)$(datasubdir)/ideal/$$f; \
+ $(INSTALL_DATA) $(srcdir)/libfiles/$$f \
+ $(DESTDIR)$(datasubdir)/ideal/$$f; \
done
-
.PHONY: uninstall_sub
-uninstall_sub:
+uninstall_sub: $
$(RM) $(DESTDIR)$(bindir)/gideal
-rmdir $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(datasubdir)/ideal/files/*
- -rmdir $(DESTDIR)$(datasubdir)/ideal/files
- $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
- -rmdir $(DESTDIR)$(datasubdir)/ideal/libfiles
+ for f in $(LIBFILES); do \
+ $(RM) $(DESTDIR)$(datasubdir)/ideal/$$f; \
+ done
-rmdir $(DESTDIR)$(datasubdir)/ideal
+ for f in $(FILES); do \
+ $(RM) $(DESTDIR)$(exampledir)/ideal/$$f; \
+ done
+ -rmdir $(DESTDIR)$(exampledir)/ideal
########################################################################
diff --git a/contrib/gideal/files/opaque_MIT.ideal.ms
b/contrib/gideal/files/opaque_MIT.ideal.ms
index 804538c..4e97993 100644
--- a/contrib/gideal/files/opaque_MIT.ideal.ms
+++ b/contrib/gideal/files/opaque_MIT.ideal.ms
@@ -1,21 +1,3 @@
-.\" --------------------------------------------------------------------
-.\" Legalese
-.\" --------------------------------------------------------------------
-.
-.ig
-Copyright 2014 Free Software Foundation, Inc.
-
-This file is part of `ideal', which is part of `groff', a free
-software project.
-
-You can redistribute it and/or modify it under the terms of the `GNU
-General Public License version 2' (GPL2) as published by the `Free
-Software Foundation'.
-
-The license text is available in the internet at
-<http://www.gnu.org/licenses/gpl-2.0.html>.
-..
-.
.NH 1
Opaque Boxes
.PP
diff --git a/contrib/gideal/gideal.pl b/contrib/gideal/gideal.pl
index f6768e8..39e7493 100755
--- a/contrib/gideal/gideal.pl
+++ b/contrib/gideal/gideal.pl
@@ -9,7 +9,7 @@
# Written by Bernd Warken <address@hidden>.
-my $version = '0.9.6';
+my $version = '0.9.7';
# This file is part of `gideal', which is part of `groff'.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: gideal: version 0.9.7; repair Makefile.sub; remove GPL2 as in original file,
Bernd Warken <=