diff -ru gmic-1.6.8.orig/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig/src/Makefile	2015-12-09 13:49:16.000000000 +0100
+++ gmic-1.6.8/src/Makefile	2015-12-21 11:50:21.187411451 +0100
@@ -93,6 +93,7 @@
 
 # Flags that are mandatory to compile 'gmic'.
 MANDATORY_CFLAGS = -Dgmic_build -Dcimg_use_zlib -I$(USR)/$(INCLUDE) $(PRERELEASE_CFLAGS)
+MANDATORY_CFLAGS += $(CFLAGS)
 MANDATORY_LIBS = -lz
 ifndef NO_SRIPDLIB
 MANDATORY_CFLAGS += -std=c++11
@@ -119,7 +120,7 @@
 
 # Flags to enable optimizations.
 ifeq ($(notdir $(CC)),g++)
-OPT_CFLAGS = -O2 -mtune=generic
+OPT_CFLAGS = -O2 # -mtune=generic
 else
 ifeq ($(notdir $(CC)),icpc)
 OPT_CFLAGS = -fast
@@ -151,12 +152,12 @@
 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
 # This requires the presence of the X11 include and library files.
 X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
+X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
 
 # Flags to enable fast display, using XShm.
 # This requires the presence of the X11 extension include and library files.
 XSHM_CFLAGS = -Dcimg_use_xshm
-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
+XSHM_LIBS = -L$(USR)/X11R6/$(LIB) -lXext
 
 # Flags to enable image display, using GDI32.
 # This requires the presence of the GDI32 include and library files.
@@ -244,7 +245,8 @@
 
 # CLI interface: Static build.
 #-----------------------------
-STATIC_CLI_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+#STATIC_CLI_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+STATIC_CLI_PATH = $(USR)/${LIB}
 STATIC_CLI_EXTRA =
 STATIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
 STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
@@ -291,7 +293,7 @@
 # G'MIC Online interface: Standard build.
 #----------------------------------------
 STD_GMICOL_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
-STD_GMICOL_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
+STD_GMICOL_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(USR)/$(LIB)/libfftw3.a $(USR)/$(LIB)/libfftw3_threads.a
 
 #--------------------------
 # Define Makefile entries.
Only in gmic-1.6.8/src: Makefile.orig
Only in gmic-1.6.8/src: Makefile.rej