diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2005-10-18 Alan Coopersmith <alan.coopersmith@sun.com> + + * Makefile.am: + Substitute __VENDOR__ with $(VENDORNAME) in disclaimer in XVidtune + app-defaults file + + * configure.ac: + Add --with-vendor-name option to set $(VENDORNAME). + Set default $(VENDORNAME) to "The X.Org Foundation". + 2005-10-13 Alan Coopersmith <alan.coopersmith@sun.com> * man/Makefile.am: diff --git a/Makefile.am b/Makefile.am index b938cb6..692a887 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,8 @@ appdefaultdir = $(libdir)/X11/app-defaults appdefault_DATA = Xvidtune Xvidtune: Xvidtune.cpp - $(RAWCPP) $(srcdir)/Xvidtune.cpp | sed -e s/^\#.*$$//g > $@ + $(RAWCPP) $(srcdir)/Xvidtune.cpp | \ + sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > $@ EXTRA_DIST = Xvidtune.cpp $(appman_SOURCES) diff --git a/configure.ac b/configure.ac index 9352e6b..8778333 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,13 @@ echo $XVIDTUNE_LIBS AC_SUBST(XVIDTUNE_CFLAGS) AC_SUBST(XVIDTUNE_LIBS) +AC_ARG_WITH(vendor-name, + AS_HELP_STRING([--with-vendor-name=VENDOR], + [Vendor name for disclaimer statement]), + [ VENDOR_NAME="$withval" ], + [ VENDOR_NAME="The X.Org Foundation" ]) +AC_SUBST([VENDOR_NAME]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |