Attachment 19429 Details for Bug 17940 – patch for VPATH build

[patch] patch for VPATH build

patch-01-VPATH (text/plain), 2.23 KB, created by Peter Breitenlohner on 2008-10-07 02:58:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-10-07 02:58:28 UTC

Size: 2.23 KB

patch

obsolete

>	I don't really care much about rstart (see comment
>	"FIXME: Someone who cares about rstart ..." in Makefile.am).
>
>	However, I strongly dislike it when files are installed in the
>	wrong place or not installed t all.
>
>diff -ur rstart-1.0.2.orig/Makefile.am rstart-1.0.2/Makefile.am
>--- rstart-1.0.2.orig/Makefile.am	2005-12-06 23:48:18.000000000 +0100
>+++ rstart-1.0.2/Makefile.am	2008-09-23 21:47:54.000000000 +0200
>@@ -102,39 +102,39 @@
> DATA_DIR = $(libdir)/X11/rstart
> 
> install-data-hook:
>-	for name in `find ${srcdir}/commands -print | grep -v CVS` ; do	\
>-	    if test -f $$name; then					\
>+	for name in `cd ${srcdir}; find commands -print | grep -v CVS` ; do	\
>+	    if test -f ${srcdir}/$$name; then				\
> 	        sed							\
> 		    -e 's,ENVPREFIX,RSTART,g'				\
>-		        < $$name > $(DESTDIR)$(DATA_DIR)/$$name;	\
>-		case `basename $(DESTDIR)$(DATA_DIR)/$$name` in		\
>+		        < ${srcdir}/$$name > $(DESTDIR)$(DATA_DIR)/$$name;	\
>+		case `basename $$name` in				\
> 		@*)							\
> 		    ;;							\
> 		*)							\
> 		    chmod a+x $(DESTDIR)$(DATA_DIR)/$$name ;;		\
> 		esac;							\
> 	    else							\
>-	        if [ -d $$name ] ; then					\
>+	        if [ -d ${srcdir}/$$name ] ; then					\
> 	            mkdir -p $(DESTDIR)$(DATA_DIR)/$$name ;		\
> 	        fi;							\
> 	    fi;								\
> 	done;								\
> 									\
>-	for name in `find ${srcdir}/contexts -print | grep -v CVS` ; do	\
>-	    if test -f $$name; then					\
>+	for name in `cd ${srcdir}; find contexts -print | grep -v CVS` ; do	\
>+	    if test -f ${srcdir}/$$name; then				\
> 	        sed							\
> 	            -e 's,_PATH,$(DEFAULT_USER_PATH),g'			\
> 	            -e 's,_MANPATH,$(DEFAULT_X_MANPATH),g'		\
>-			< $$name > $(DESTDIR)$(DATA_DIR)/$$name ;	\
>+			< ${srcdir}/$$name > $(DESTDIR)$(DATA_DIR)/$$name ;	\
> 	    else							\
>-	        if [ -d $$name ] ; then					\
>+	        if [ -d ${srcdir}/$$name ] ; then					\
> 	            mkdir -p $(DESTDIR)$(DATA_DIR)/$$name	;	\
> 	        fi ;							\
> 	    fi ;							\
> 	done;								\
> 									\
> 	cd $(DESTDIR)$(DATA_DIR)/contexts;				\
>-	sed -e '/^$$/d' -e '/^#/d' ${srcdir}/contexts/@Aliases |	\
>+	sed -e '/^$$/d' -e '/^#/d' @Aliases |				\
> 	    while read real aliases; do					\
> 	        for i in $$aliases; do					\
> 	            $(RM) $$i;						\

Actions: View | Splinter Review

Attachments on bug 17940: 19429

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.