]>
Commit | Line | Data |
---|---|---|
947b295e JR |
1 | diff --git a/Makefile.am b/Makefile.am |
2 | index f65afea..12317dc 100644 | |
3 | --- a/Makefile.am | |
4 | +++ b/Makefile.am | |
5 | @@ -167,7 +167,7 @@ if !HPLIP_CLASS_DRIVER | |
6 | dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py | |
7 | endif #HPLIP_CLASS_DRIVER | |
8 | ||
9 | -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so | |
10 | +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template | |
11 | ||
12 | dist_noinst_DATA += prnt/ipp-usb/HPLIP.conf | |
13 | dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv | |
14 | @@ -597,7 +597,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp | |
15 | prnt/hpcups/ImageProcessor.h | |
16 | ||
17 | hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) | |
18 | -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) | |
19 | +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) | |
20 | #else | |
21 | #hpcupsdir = $(cupsfilterdir) | |
22 | #hpcups_PROGRAMS = hpcups | |
23 | @@ -687,16 +687,6 @@ endif #HPLIP_CLASS_DRIVER | |
24 | ||
25 | install-data-hook: | |
26 | if HPLIP_BUILD | |
27 | - if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ | |
28 | - cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ | |
29 | - chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ | |
30 | - ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ | |
31 | - fi; \ | |
32 | - if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ | |
33 | - cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ | |
34 | - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ | |
35 | - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ | |
36 | - fi | |
37 | if [ -d "/usr/share/ipp-usb/quirks/" ]; then \ | |
38 | echo "ipp-usb directory exists"; \ | |
39 | cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \ |