summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-plugins/docker/files/docker-1.5-makefile_rename.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-plugins/docker/files/docker-1.5-makefile_rename.patch')
-rw-r--r--x11-plugins/docker/files/docker-1.5-makefile_rename.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
new file mode 100644
index 000000000000..2e742661b11d
--- /dev/null
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -0,0 +1,49 @@
+--- Makefile.orig 2015-01-19 20:10:47.762522964 +0100
++++ Makefile 2015-01-19 20:11:11.463545692 +0100
+@@ -5,12 +5,10 @@
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+
+ # Change this PREFIX to where you want docker to be installed
+-PREFIX=/usr/local
+-# Change this XLIBPATH to point to your X11 development package's installation
+-XLIBPATH=/usr/X11R6/lib
++PREFIX = /usr
+
+ # Sets some flags for stricter compiling
+-CFLAGS=-pedantic -Wall -W -O
++CFLAGS += -pedantic -Wall -W
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -21,17 +19,17 @@
+ PACKAGE=docker
+ VERSION=1.5
+
+-target=docker
++target=wmdocker
+ sources=docker.c kde.c icons.c xproperty.c net.c
+ headers=docker.h kde.h icons.h xproperty.h net.h version.h
+-extra=README COPYING version.h.in
++extra=README version.h.in
+
+ all: $(target) $(sources) $(headers)
+ @echo Build Successful
+
+ $(target): $(sources:.c=.o)
+- $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+- `pkg-config --libs glib-2.0` $^ -o $@
++ $(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
++ `pkg-config --libs glib-2.0` -o $@
+
+ %.o: %.c
+ $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
+@@ -40,7 +38,8 @@
+ sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
+
+ install: all
+- install $(target) $(PREFIX)/bin/$(target)
++ install -d $(DESTDIR)$(PREFIX)/bin
++ install $(target) $(DESTDIR)$(PREFIX)/bin/$(target)
+
+ uninstall:
+ rm -f $(PREFIX)/$(target)