rocklinux/package/praenti/openmotif/duplicate-file.patch

# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
# 
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
# 
# ROCK Linux: rock-src/package/praenti/openmotif/duplicate-file.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
# 
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
# 
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
# 
# --- ROCK-COPYRIGHT-NOTE-END ---

diff -Nur openMotif-2.2.2-org/demos/programs/Column/Makefile.in openMotif-2.2.2/demos/programs/Column/Makefile.in
--- openMotif-2.2.2-org/demos/programs/Column/Makefile.in	2003-04-28 17:10:53.000000000 +0200
+++ openMotif-2.2.2/demos/programs/Column/Makefile.in	2003-04-28 17:12:34.000000000 +0200
@@ -90,17 +90,17 @@
 
 datadir = ${prefix}/share/Xm/Column
 
-bin_PROGRAMS = column
-column_SOURCES = column.c
+bin_PROGRAMS = Column
+Column_SOURCES = column.c
 EXTRA_DIST = Imakefile Column.ad
-data_DATA = $(EXTRA_DIST) $(column_SOURCES)
+data_DATA = $(EXTRA_DIST) $(Column_SOURCES)
 TOPDIR = ../../..
 LDADD = $(TOPDIR)/lib/Xm/libXm.la
 INCLUDES = -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../include/config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  column$(EXEEXT)
+bin_PROGRAMS =  Column$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -112,10 +112,10 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-column_OBJECTS =  column.$(OBJEXT)
-column_LDADD = $(LDADD)
-column_DEPENDENCIES =  $(TOPDIR)/lib/Xm/libXm.la
-column_LDFLAGS = 
+Column_OBJECTS =  column.$(OBJEXT)
+Column_LDADD = $(LDADD)
+Column_DEPENDENCIES =  $(TOPDIR)/lib/Xm/libXm.la
+Column_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -130,8 +130,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(column_SOURCES)
-OBJECTS = $(column_OBJECTS)
+SOURCES = $(Column_SOURCES)
+OBJECTS = $(Column_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -213,9 +213,9 @@
 
 maintainer-clean-libtool:
 
-column$(EXEEXT): $(column_OBJECTS) $(column_DEPENDENCIES)
-	@rm -f column$(EXEEXT)
-	$(LINK) $(column_LDFLAGS) $(column_OBJECTS) $(column_LDADD) $(LIBS)
+Column$(EXEEXT): $(Column_OBJECTS) $(Column_DEPENDENCIES)
+	@rm -f Column$(EXEEXT)
+	$(LINK) $(Column_LDFLAGS) $(Column_OBJECTS) $(Column_LDADD) $(LIBS)
 
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
diff -Nur openMotif-2.2.2-org/demos/programs/Tree/Makefile.in openMotif-2.2.2/demos/programs/Tree/Makefile.in
--- openMotif-2.2.2-org/demos/programs/Tree/Makefile.in	2003-04-28 17:10:53.000000000 +0200
+++ openMotif-2.2.2/demos/programs/Tree/Makefile.in	2003-04-28 17:12:34.000000000 +0200
@@ -91,9 +91,9 @@
 datadir = ${prefix}/share/Xm/Tree
 
 EXTRA_DIST = Imakefile
-bin_PROGRAMS = tree
-tree_SOURCES = bxutil-c.c  tree.c
-data_DATA = $(EXTRA_DIST) $(tree_SOURCES)
+bin_PROGRAMS = Tree
+Tree_SOURCES = bxutil-c.c  tree.c
+data_DATA = $(EXTRA_DIST) $(Tree_SOURCES)
 TOPDIR = ../../..
 LDADD = $(TOPDIR)/lib/Xm/libXm.la
 
@@ -101,7 +101,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../include/config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  tree$(EXEEXT)
+bin_PROGRAMS =  Tree$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -113,10 +113,10 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-tree_OBJECTS =  bxutil-c.$(OBJEXT) tree.$(OBJEXT)
-tree_LDADD = $(LDADD)
-tree_DEPENDENCIES =  $(TOPDIR)/lib/Xm/libXm.la
-tree_LDFLAGS = 
+Tree_OBJECTS =  bxutil-c.$(OBJEXT) tree.$(OBJEXT)
+Tree_LDADD = $(LDADD)
+Tree_DEPENDENCIES =  $(TOPDIR)/lib/Xm/libXm.la
+Tree_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -131,8 +131,8 @@
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(tree_SOURCES)
-OBJECTS = $(tree_OBJECTS)
+SOURCES = $(Tree_SOURCES)
+OBJECTS = $(Tree_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -214,9 +214,9 @@
 
 maintainer-clean-libtool:
 
-tree$(EXEEXT): $(tree_OBJECTS) $(tree_DEPENDENCIES)
-	@rm -f tree$(EXEEXT)
-	$(LINK) $(tree_LDFLAGS) $(tree_OBJECTS) $(tree_LDADD) $(LIBS)
+Tree$(EXEEXT): $(Tree_OBJECTS) $(Tree_DEPENDENCIES)
+	@rm -f Tree$(EXEEXT)
+	$(LINK) $(Tree_LDFLAGS) $(Tree_OBJECTS) $(Tree_LDADD) $(LIBS)
 
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)