voyageur 15/01/19 19:31:07 Added: docker-1.5-makefile_rename.patch Log: Move under desktop-dock, block app-emulation/docker in current stable, clean ebuild and rename binary (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Revision Changes Path 1.1 x11-plugins/docker/files/docker-1.5-makefile_rename.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile_rename.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile_rename.patch?rev=1.1&content-type=text/plain Index: docker-1.5-makefile_rename.patch =================================================================== --- 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)
