2837 - remove print/lp* from gate and use CUPS from userland

@@ -28,29 +28,33 @@
 OBJECTS = mod_ipp.o
 
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-APACHEMODDIR =  $(ROOT)/usr/apache/libexec
-APACHECONFDIR = $(ROOT)/etc/apache
+APACHEMODDIR =  $(ROOT)/usr/apache2/2.2/libexec
+APACHECONFDIR = $(ROOT)/etc/apache2/2.2
 LISTENERDIR =   $(ROOT)/var/lp/ipp-listener
 
-ROOTDIRS =      $(ROOT)/usr/apache $(APACHEMODDIR) $(APACHECONFDIR) \
+ROOTDIRS =      $(ROOT)/usr/apache2/2.2 $(APACHEMODDIR) $(APACHECONFDIR) \
                 $(ROOT)/var/lp $(LISTENERDIR)
 
 $(ROOT)/var/lp:=        DIRMODE = 775
 $(ROOT)/var/lp:=        FILEMODE = 775
 
 LIBS =                  $(DYNLIB)
 
 SRCS = $(OBJECTS:%.o = %.c)
 
-
+APR_INC.cmd =  apr-1-config --includes
+APU_INC.cmd =  apu-1-config --includes
 CFLAGS +=       $(CCVERBOSE)
+
 CPPFLAGS +=     -I../libipp-listener/common
 CPPFLAGS +=     -I../libipp-core/common
-CPPFLAGS +=     -I/usr/apache/include
+CPPFLAGS +=     -I/usr/apache2/2.2/include
+CPPFLAGS +=    $(APR_INC.cmd:sh)
+CPPFLAGS +=    $(APU_INC.cmd:sh)
 CPPFLAGS +=     -DEAPI
 ZDEFS =         $(ZNODEFS)
 
 MAPFILES =      mapfile