regen patches.

remove bogus token pasting "a" "b"  works, and those are separate tokens.
This commit is contained in:
espie 2004-01-01 15:10:59 +00:00
parent 8cfb11ab8e
commit f9dbd10763
3 changed files with 24 additions and 10 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.2 2002/02/10 03:04:18 jcs Exp $
--- Makefile.orig Fri Feb 1 14:09:54 2002
+++ Makefile Sat Feb 9 20:51:52 2002
$OpenBSD: patch-Makefile,v 1.3 2004/01/01 15:10:59 espie Exp $
--- Makefile.orig 2002-02-01 21:09:54.000000000 +0100
+++ Makefile 2003-12-31 22:45:18.000000000 +0100
@@ -4,7 +4,7 @@
# This should be set to the location of the X installation you want to
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.2 2002/02/10 03:04:18 jcs Exp $
# Comment out to remove shape support (for X11R5 or just a tiny bin)
DEFINES += -DSHAPE
@@ -27,12 +27,12 @@
@@ -27,12 +27,12 @@ DEFINES += -DGNOME_PDA
# --------------------------------------------------------------------
@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile,v 1.2 2002/02/10 03:04:18 jcs Exp $
INCLUDES = -Ilib -I$(XROOT)/include
LDPATH = -L$(XROOT)/lib
LIBS = -lX11 $(EXTRA_LIBS)
@@ -45,7 +45,7 @@
@@ -45,7 +45,7 @@ HEADERS = aewm.h
all: $(PROG) subdirs
subdirs:
@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile,v 1.2 2002/02/10 03:04:18 jcs Exp $
$(PROG): $(OBJS)
$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
@@ -54,16 +54,15 @@
@@ -54,16 +54,15 @@ $(OBJS): %.o: %.c $(HEADERS)
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
install: all

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-clients_Makefile,v 1.1 2002/02/10 03:04:18 jcs Exp $
--- clients/Makefile.orig Sun Jan 27 17:13:20 2002
+++ clients/Makefile Sat Feb 9 20:51:10 2002
$OpenBSD: patch-clients_Makefile,v 1.2 2004/01/01 15:10:59 espie Exp $
--- clients/Makefile.orig 2002-01-28 00:13:20.000000000 +0100
+++ clients/Makefile 2003-12-31 22:45:18.000000000 +0100
@@ -2,15 +2,15 @@
# Copyright 1998-2001 Decklin Foster <decklin@red-bean.com>
# This program is free software; see LICENSE for details.
@ -24,7 +24,7 @@ $OpenBSD: patch-clients_Makefile,v 1.1 2002/02/10 03:04:18 jcs Exp $
X11PATH = -I$(XROOT)/include
X11LIBS = -L$(XROOT)/lib -lX11
XAWLIBS = -L$(XROOT)/lib -lX11 -lXt -lXaw
@@ -72,15 +72,14 @@
@@ -72,15 +72,14 @@ $(ETCOBJS): %.o: %.c
# --------------------------------------------------------------------
install: all

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_common_h,v 1.1 2004/01/01 15:10:59 espie Exp $
--- lib/common.h.orig 2004-01-01 16:05:39.000000000 +0100
+++ lib/common.h 2004-01-01 16:05:50.000000000 +0100
@@ -7,8 +7,8 @@
#define BUF_SIZE 2048
#define ARG(longname, shortname, nargs) \
- ((strcmp(argv[i], "--"##longname) == 0 \
- || strcmp(argv[i], "-"##shortname) == 0) \
+ ((strcmp(argv[i], "--"longname) == 0 \
+ || strcmp(argv[i], "-"shortname) == 0) \
&& i + (nargs) < argc)
#endif /* AEWM_COMMON_H */