rpms/open-vm-tools/F-11 open-vm-tools-172495-pluginpath.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 open-vm-tools.spec, 1.8, 1.9 sources, 1.6, 1.7
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28781
Modified Files:
.cvsignore open-vm-tools.spec sources
Added Files:
open-vm-tools-172495-pluginpath.patch
Log Message:
- Update to upstream build 172495
- Split libs subpackage for multilib friendliness
- Added pam-devel BR
- Switch to vmtoolsd for vmsvc, updated init file
- Added patch to fix default vmtoolsd plugin path
open-vm-tools-172495-pluginpath.patch:
--- NEW FILE open-vm-tools-172495-pluginpath.patch ---
--- open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in~ 2009-06-18 09:03:40.000000000 +0200
+++ open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in 2009-06-30 12:19:16.985865101 +0200
@@ -278,7 +278,7 @@
pamdir = $(PAM_PREFIX)/pam.d
vmtoolsd_CPPFLAGS = @VMTOOLS_CPPFLAGS@ @GMODULE_CPPFLAGS@ \
@GOBJECT_CPPFLAGS@ @GTHREAD_CPPFLAGS@ -I$(builddir) \
- -DVMTOOLSD_PLUGIN_ROOT=\"$(pkglibdir)\"
+ -DVMTOOLSD_PLUGIN_ROOT=\"$(sysconfdir)/vmware-tools/plugins\"
vmtoolsd_LDADD = @VMTOOLS_LIBS@ @GMODULE_LIBS@ @GOBJECT_LIBS@ \
@GTHREAD_LIBS@ $(am__append_1)
vmtoolsd_SOURCES = cmdLine.c mainLoop.c mainPosix.c pluginMgr.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 23 Mar 2009 10:48:03 -0000 1.6
+++ .cvsignore 4 Jul 2009 12:23:50 -0000 1.7
@@ -1 +1 @@
-open-vm-tools-2009.03.18-154848.tar.gz
+open-vm-tools-2009.06.18-172495.tar.gz
Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-11/open-vm-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- open-vm-tools.spec 3 Apr 2009 21:57:33 -0000 1.8
+++ open-vm-tools.spec 4 Jul 2009 12:23:50 -0000 1.9
@@ -1,9 +1,9 @@
-%define builddate 2009.03.18
-%define buildver 154848
+%define builddate 2009.06.18
+%define buildver 172495
Name: open-vm-tools
Version: 0.0.0.%{buildver}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: VMware Guest OS Tools
Group: Applications/System
License: LGPLv2
@@ -13,6 +13,7 @@
Source2: %{name}-sysconfig.mouse
Source3: vmware-toolbox.desktop
Source4: %{name}-modprobe.vmnics
+Patch0: open-vm-tools-172495-pluginpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 x86_64
@@ -21,6 +22,7 @@
BuildRequires: gtkmm24-devel
BuildRequires: libXtst-devel
BuildRequires: libdnet-devel
+BuildRequires: pam-devel
BuildRequires: procps
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
@@ -28,6 +30,7 @@
BuildRequires: uriparser-devel
BuildRequires: libnotify-devel
BuildRequires: libXScrnSaver-devel
+BuildRequires: doxygen graphviz
Requires: open-vm-tools-kmod >= %{version}
Obsoletes: open-vm-tools-kmod < %{version}
@@ -41,11 +44,22 @@
machines. This package contains the user-space programs and libraries
of open-vm-tools.
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+
+
+%description libs
+The %{name}-libs package contains the runtime shared libraries for
+%{name}.
+
+
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+
%description devel
Open-vm-tools are the open source implementation of VMware Tools. They
are a set of guest operating system virtualization components that
@@ -56,6 +70,7 @@
%prep
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
+%patch0 -p1 -b .pluginpath
# Fix some permissions and formats
chmod -x NEWS README ChangeLog AUTHORS COPYING
sed -i 's/\r//' README
@@ -64,6 +79,7 @@
%build
%configure \
--disable-static \
+ --enable-docs \
--disable-dependency-tracking \
--without-kernel-modules \
--without-root-privileges \
@@ -81,9 +97,9 @@
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# Install vmware-guestd init script
+# Install vmtoolsd init script
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmware-guestd
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmtoolsd
# GPM vmmouse support
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -95,7 +111,7 @@
# Install VMCI sockets header file
mkdir -p $RPM_BUILD_ROOT%{_includedir}
-install -m 0644 modules/linux/vsock/linux/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir}
+install -m 0644 lib/include/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir}
# Move vmware-user desktop into autostart directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
@@ -108,7 +124,10 @@
# Setup module-init-tools file for vmxnet
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics.conf
+
+# Set suid bit on vmware-user suid wrapper
+chmod +s $RPM_BUILD_ROOT%{_bindir}/vmware-user-suid-wrapper
%clean
@@ -118,7 +137,7 @@
%post
# Setup guestd on initial install
/sbin/ldconfig
-[ $1 -lt 2 ] && /sbin/chkconfig vmware-guestd on ||:
+[ $1 -lt 2 ] && /sbin/chkconfig vmtoolsd on ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -131,28 +150,32 @@
# Remove on uninstall
if [ "$1" = 0 ]
then
- /sbin/service vmware-guestd stop > /dev/null 2>&1 || :
- /sbin/chkconfig --del vmware-guestd ||:
+ /sbin/service vmtoolsd stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del vmtoolsd ||:
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_docdir}/open-vm-tools
%{_bindir}/vm*
-%{_sbindir}/vmware*
%{_datadir}/applications/*.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/pixmaps/*.xpm
-%{_libdir}/*.so.*
-%{_libdir}/open-vm-tools
+%{_datadir}/open-vm-tools
%{_sysconfdir}/init.d/*
%{_sysconfdir}/vmware-tools
%config(noreplace) %{_sysconfdir}/pam.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/mouse
%config(noreplace) %{_sysconfdir}/modprobe.d/*
%attr(4755,root,root) /sbin/mount.vmhgfs
-%attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+%{_libdir}/open-vm-tools
%files devel
@@ -162,6 +185,13 @@
%changelog
+* Sat Jul 4 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.172495-1
+- Update to upstream build 172495
+- Split libs subpackage for multilib friendliness
+- Added pam-devel BR
+- Switch to vmtoolsd for vmsvc, updated init file
+- Added patch to fix default vmtoolsd plugin path
+
* Fri Apr 3 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.154848-3
- Fixing ExclusiveArch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Mar 2009 10:48:04 -0000 1.6
+++ sources 4 Jul 2009 12:23:50 -0000 1.7
@@ -1 +1 @@
-23d577a1bc07fa61bcd5352e94f05ed6 open-vm-tools-2009.03.18-154848.tar.gz
+8bd5304e84465005bb01b5055497cce1 open-vm-tools-2009.06.18-172495.tar.gz
15 years, 4 months
- 1
- 0
rpms/em8300-kmod/F-10 .cvsignore, 1.4, 1.5 em8300-kmod.spec, 1.30, 1.31 sources, 1.4, 1.5
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/em8300-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15539
Modified Files:
.cvsignore em8300-kmod.spec sources
Log Message:
* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
- update to 0.17.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Nov 2008 10:27:22 -0000 1.4
+++ .cvsignore 4 Jul 2009 08:10:16 -0000 1.5
@@ -1 +1 @@
-em8300-nofirmware-0.17.2.tar.gz
+em8300-nofirmware-0.17.3.tar.gz
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-10/em8300-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- em8300-kmod.spec 22 Jun 2009 19:27:10 -0000 1.30
+++ em8300-kmod.spec 4 Jul 2009 08:10:16 -0000 1.31
@@ -9,8 +9,8 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version: 0.17.2
-Release: 1%{?prever:.1.%{prever}}%{?dist}.18
+Version: 0.17.3
+Release: 1%{?prever:.1.%{prever}}%{?dist}
Group: System Environment/Kernel
License: GPLv2+
@@ -66,6 +66,9 @@
%changelog
+* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
+- update to 0.17.3
+
* Mon Jun 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-1.18
- rebuild for new kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Nov 2008 10:27:22 -0000 1.4
+++ sources 4 Jul 2009 08:10:16 -0000 1.5
@@ -1 +1 @@
-8796a6ea10bca6a150735a773b554e98 em8300-nofirmware-0.17.2.tar.gz
+6332ddd72e95b15546d1b57b1d21856a em8300-nofirmware-0.17.3.tar.gz
15 years, 4 months
- 1
- 0
rpms/em8300-kmod/devel .cvsignore, 1.4, 1.5 em8300-kmod.spec, 1.37, 1.38 sources, 1.4, 1.5 em8300-kernel-2.6.29-fix.patch, 1.1, NONE
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/em8300-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15407
Modified Files:
.cvsignore em8300-kmod.spec sources
Removed Files:
em8300-kernel-2.6.29-fix.patch
Log Message:
* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
- update to 0.17.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Nov 2008 10:27:22 -0000 1.4
+++ .cvsignore 4 Jul 2009 08:08:10 -0000 1.5
@@ -1 +1 @@
-em8300-nofirmware-0.17.2.tar.gz
+em8300-nofirmware-0.17.3.tar.gz
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- em8300-kmod.spec 5 Jun 2009 13:19:20 -0000 1.37
+++ em8300-kmod.spec 4 Jul 2009 08:08:10 -0000 1.38
@@ -9,8 +9,8 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version: 0.17.2
-Release: 3%{?prever:.1.%{prever}}%{?dist}.23
+Version: 0.17.3
+Release: 1%{?prever:.1.%{prever}}%{?dist}
Group: System Environment/Kernel
License: GPLv2+
@@ -18,7 +18,6 @@
#Source0: http://dxr3.sourceforge.net/download/em8300-%{version}%{?prever:-%{prever... with modules/em8300.uc removed
#Source0: em8300-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
Source0: http://downloads.sourceforge.net/dxr3/em8300-nofirmware-%{version}%{?prev...
-Patch0: em8300-kernel-2.6.29-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -39,7 +38,6 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c
-%patch0
for kernel_version in %{?kernel_versions} ; do
cp -a em8300-%{version}%{?prever:-%{prever}} \
_kmod_build_${kernel_version%%___*}
@@ -68,6 +66,9 @@
%changelog
+* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
+- update to 0.17.3
+
* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-3.23
- rebuild for new kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Nov 2008 10:27:22 -0000 1.4
+++ sources 4 Jul 2009 08:08:10 -0000 1.5
@@ -1 +1 @@
-8796a6ea10bca6a150735a773b554e98 em8300-nofirmware-0.17.2.tar.gz
+6332ddd72e95b15546d1b57b1d21856a em8300-nofirmware-0.17.3.tar.gz
--- em8300-kernel-2.6.29-fix.patch DELETED ---
15 years, 4 months
- 1
- 0
rpms/em8300-kmod/F-11 .cvsignore, 1.4, 1.5 em8300-kmod.spec, 1.38, 1.39 sources, 1.4, 1.5
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/em8300-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14657
Modified Files:
.cvsignore em8300-kmod.spec sources
Log Message:
* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
- update to 0.17.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Nov 2008 10:27:22 -0000 1.4
+++ .cvsignore 4 Jul 2009 07:59:42 -0000 1.5
@@ -1 +1 @@
-em8300-nofirmware-0.17.2.tar.gz
+em8300-nofirmware-0.17.3.tar.gz
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-11/em8300-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- em8300-kmod.spec 21 Jun 2009 08:52:29 -0000 1.38
+++ em8300-kmod.spec 4 Jul 2009 07:59:42 -0000 1.39
@@ -9,8 +9,8 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version: 0.17.2
-Release: 3%{?prever:.1.%{prever}}%{?dist}.24
+Version: 0.17.3
+Release: 1%{?prever:.1.%{prever}}%{?dist}
Group: System Environment/Kernel
License: GPLv2+
@@ -18,7 +18,6 @@
#Source0: http://dxr3.sourceforge.net/download/em8300-%{version}%{?prever:-%{prever... with modules/em8300.uc removed
#Source0: em8300-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
Source0: http://downloads.sourceforge.net/dxr3/em8300-nofirmware-%{version}%{?prev...
-Patch0: em8300-kernel-2.6.29-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -39,7 +38,6 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c
-%patch0
for kernel_version in %{?kernel_versions} ; do
cp -a em8300-%{version}%{?prever:-%{prever}} \
_kmod_build_${kernel_version%%___*}
@@ -68,6 +66,9 @@
%changelog
+* Sat Jul 04 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 0.17.3-1
+- update to 0.17.3
+
* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-3.24
- rebuild for new kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Nov 2008 10:27:22 -0000 1.4
+++ sources 4 Jul 2009 07:59:42 -0000 1.5
@@ -1 +1 @@
-8796a6ea10bca6a150735a773b554e98 em8300-nofirmware-0.17.2.tar.gz
+6332ddd72e95b15546d1b57b1d21856a em8300-nofirmware-0.17.3.tar.gz
15 years, 4 months
- 1
- 0
rpms/paintdotnet/F-11 paintdotnet-x64.patch, NONE, 1.1 paintdotnet.desktop, NONE, 1.1 paintdotnet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Eric Moret
Author: emoret
Update of /cvs/nonfree/rpms/paintdotnet/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11570/F-11
Modified Files:
.cvsignore sources
Added Files:
paintdotnet-x64.patch paintdotnet.desktop paintdotnet.spec
Log Message:
Inirial import in F-11 branch
paintdotnet-x64.patch:
--- NEW FILE paintdotnet-x64.patch ---
diff -ruN paintdotnet-0.1.63.orig/configure paintdotnet-0.1.63/configure
--- paintdotnet-0.1.63.orig/configure 2009-03-25 09:08:32.000000000 -0700
+++ paintdotnet-0.1.63/configure 2009-05-03 17:55:09.000000000 -0700
@@ -2,6 +2,7 @@
VERSION=0.1
PACKAGE=paintdotnet
prefix=/usr/local
+libdir=/usr/local/lib
config=RELEASE_AND_PACKAGE_ANY_CPU
configurations=" DEBUG_ANY_CPU RELEASE_ANY_CPU RELEASE_AND_PACKAGE_ANY_CPU"
common_packages=""
@@ -9,7 +10,7 @@
usage ()
{
- echo "Usage : configure [--prefix=PREFIX] [--config=CONFIG]"
+ echo "Usage : configure [--prefix=PREFIX] [--libdir=LIBDIR] [--config=CONFIG]"
echo
echo "Configurations available :"
for c in $configurations; do
@@ -92,6 +93,13 @@
shift
prefix=$1
;;
+ --libdir=*)
+ libdir=`echo $1 | sed 's/--libdir=//'`
+ ;;
+ --libdir)
+ shift
+ libdir=$1
+ ;;
--config=*)
conf=`echo $1 | sed 's/--config=//'`
validate_config "$conf"
@@ -122,6 +130,7 @@
check_svn_revision
echo "prefix=$prefix" > config.make
+echo "libdir=$libdir" >> config.make
echo "RUNTIME=mono" >> config.make
echo "ASSEMBLY_VERSION=$VERSION.$revision.0" >> config.make
echo "VERSION=$VERSION.$revision" >> config.make
@@ -131,5 +140,6 @@
echo
echo "$PACKAGE has been configured with "
echo " prefix = $prefix"
+echo " libdir = $libdir"
echo " config = $config"
echo
diff -ruN paintdotnet-0.1.63.orig/Data/data.pc.in paintdotnet-0.1.63/Data/data.pc.in
--- paintdotnet-0.1.63.orig/Data/data.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Data/data.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Data.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Data.dll
diff -ruN paintdotnet-0.1.63.orig/Data/Makefile paintdotnet-0.1.63/Data/Makefile
--- paintdotnet-0.1.63.orig/Data/Makefile 2009-03-25 08:25:20.000000000 -0700
+++ paintdotnet-0.1.63/Data/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -195,44 +195,44 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(DATA_PC) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PDNLIB_DLL) $(MICROSOFT_INK_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(DATA_PC)' || cp $(DATA_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(DATA_PC)' || cp $(DATA_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
make post-install-local-hook prefix=$(prefix)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(DATA_PC) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PDNLIB_DLL) $(MICROSOFT_INK_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL)
make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(DATA_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(DATA_PC))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(DATA_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(DATA_PC))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
make post-uninstall-local-hook prefix=$(prefix)
install: install-local
diff -ruN paintdotnet-0.1.63.orig/Effects/effects.pc.in paintdotnet-0.1.63/Effects/effects.pc.in
--- paintdotnet-0.1.63.orig/Effects/effects.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Effects/effects.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Effects.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Effects.dll
diff -ruN paintdotnet-0.1.63.orig/Effects/Makefile paintdotnet-0.1.63/Effects/Makefile
--- paintdotnet-0.1.63.orig/Effects/Makefile 2009-03-25 08:26:01.000000000 -0700
+++ paintdotnet-0.1.63/Effects/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -243,47 +243,47 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(EFFECTS_PC) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(EFFECTS_PC)' || cp $(EFFECTS_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(EFFECTS_PC)' || cp $(EFFECTS_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(EFFECTS_PC) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(EFFECTS_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(EFFECTS_PC))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(EFFECTS_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(EFFECTS_PC))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Makefile.include paintdotnet-0.1.63/Makefile.include
--- paintdotnet-0.1.63.orig/Makefile.include 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Makefile.include 2009-05-03 17:55:09.000000000 -0700
@@ -29,9 +29,9 @@
pkglib_SCRIPTS = $(ASSEMBLY)
bin_SCRIPTS = $(BINARIES)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
@@ -54,5 +54,5 @@
test -z '$3' || chmod +x '$$@'
$2: $2.in $(top_srcdir)/config.make
- sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," < $2.in > $2
-endef
\ No newline at end of file
+ sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," -e "s,@libdir@,$(libdir)," < $2.in > $2
+endef
\ No newline at end of file
diff -ruN paintdotnet-0.1.63.orig/paintdotnet.in paintdotnet-0.1.63/paintdotnet.in
--- paintdotnet-0.1.63.orig/paintdotnet.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/paintdotnet.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/PaintDotNet.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/PaintDotNet.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/paintdotnet.make paintdotnet-0.1.63/paintdotnet.make
--- paintdotnet-0.1.63.orig/paintdotnet.make 2009-03-25 07:28:15.000000000 -0700
+++ paintdotnet-0.1.63/paintdotnet.make 2009-05-03 17:56:13.000000000 -0700
@@ -419,48 +419,48 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_EFFECTS_DLL_MDB) $(PAINTDOTNET) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_EFFECTS_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || cp $(PAINTDOTNET_EFFECTS_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || cp $(PAINTDOTNET_EFFECTS_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(PAINTDOTNET)' || cp $(PAINTDOTNET) $(DESTDIR)$(prefix)/bin
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_EFFECTS_DLL)' || cp $(PAINTDOTNET_EFFECTS_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_EFFECTS_DLL)' || cp $(PAINTDOTNET_EFFECTS_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_EFFECTS_DLL_MDB) $(PAINTDOTNET) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_EFFECTS_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL_MDB))
test -z '$(PAINTDOTNET)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(PAINTDOTNET))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(PAINTDOTNET_EFFECTS_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- make post-uninstall-local-hook prefix=$(prefix)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(PAINTDOTNET_EFFECTS_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
diff -ruN paintdotnet-0.1.63.orig/PdnLib/Makefile paintdotnet-0.1.63/PdnLib/Makefile
--- paintdotnet-0.1.63.orig/PdnLib/Makefile 2009-03-25 08:26:42.000000000 -0700
+++ paintdotnet-0.1.63/PdnLib/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -268,39 +268,39 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PDNLIB_PC) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PDNLIB_PC)' || cp $(PDNLIB_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PDNLIB_PC)' || cp $(PDNLIB_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PDNLIB_PC) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- test -z '$(PDNLIB_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(PDNLIB_PC))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ test -z '$(PDNLIB_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(PDNLIB_PC))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/PdnLib/pdnlib.pc.in paintdotnet-0.1.63/PdnLib/pdnlib.pc.in
--- paintdotnet-0.1.63.orig/PdnLib/pdnlib.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/PdnLib/pdnlib.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PdnLib.dll
+Libs: -r:@libdir@/@PACKAGE@/PdnLib.dll
diff -ruN paintdotnet-0.1.63.orig/PdnRepair/Makefile paintdotnet-0.1.63/PdnRepair/Makefile
--- paintdotnet-0.1.63.orig/PdnRepair/Makefile 2009-03-25 08:04:18.000000000 -0700
+++ paintdotnet-0.1.63/PdnRepair/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -90,27 +90,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PDNREPAIR)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(PDNREPAIR)' || cp $(PDNREPAIR) $(DESTDIR)$(prefix)/bin
- make post-install-local-hook prefix=$(prefix)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PDNREPAIR)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
test -z '$(PDNREPAIR)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(PDNREPAIR))
- make post-uninstall-local-hook prefix=$(prefix)
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/PdnRepair/pdnrepair.in paintdotnet-0.1.63/PdnRepair/pdnrepair.in
--- paintdotnet-0.1.63.orig/PdnRepair/pdnrepair.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/PdnRepair/pdnrepair.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/PdnRepair.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/PdnRepair.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/Resources/Makefile paintdotnet-0.1.63/Resources/Makefile
--- paintdotnet-0.1.63.orig/Resources/Makefile 2009-03-25 08:27:14.000000000 -0700
+++ paintdotnet-0.1.63/Resources/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -333,35 +333,35 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(RESOURCES_PC) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(RESOURCES_PC)' || cp $(RESOURCES_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(RESOURCES_PC)' || cp $(RESOURCES_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(RESOURCES_PC) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(RESOURCES_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(RESOURCES_PC))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(RESOURCES_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(RESOURCES_PC))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Resources/resources.pc.in paintdotnet-0.1.63/Resources/resources.pc.in
--- paintdotnet-0.1.63.orig/Resources/resources.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources/resources.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Resources.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Resources.dll
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/custom-hooks.make paintdotnet-0.1.63/Resources.mui/custom-hooks.make
--- paintdotnet-0.1.63.orig/Resources.mui/custom-hooks.make 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/custom-hooks.make 2009-05-03 17:55:09.000000000 -0700
@@ -1,4 +1,4 @@
pre-install-local-hook:
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp PaintDotNet.Strings*.resources $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp ../bin/*/PaintDotNet.Strings.3.resources $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp PaintDotNet.Strings*.resources $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp ../bin/*/PaintDotNet.Strings.3.resources $(DESTDIR)$(libdir)/$(PACKAGE)
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/Makefile paintdotnet-0.1.63/Resources.mui/Makefile
--- paintdotnet-0.1.63.orig/Resources.mui/Makefile 2009-03-25 08:06:25.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -110,27 +110,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(RESOURCES_MUI)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(RESOURCES_MUI)' || cp $(RESOURCES_MUI) $(DESTDIR)$(prefix)/bin
- make post-install-local-hook prefix=$(prefix)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(RESOURCES_MUI)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
test -z '$(RESOURCES_MUI)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(RESOURCES_MUI))
- make post-uninstall-local-hook prefix=$(prefix)
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/resources.mui.in paintdotnet-0.1.63/Resources.mui/resources.mui.in
--- paintdotnet-0.1.63.orig/Resources.mui/resources.mui.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/resources.mui.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/Resources.mui.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/Resources.mui.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/StylusReader/Makefile paintdotnet-0.1.63/StylusReader/Makefile
--- paintdotnet-0.1.63.orig/StylusReader/Makefile 2009-03-25 08:14:44.000000000 -0700
+++ paintdotnet-0.1.63/StylusReader/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -94,27 +94,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(STYLUSREADER_PC)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(STYLUSREADER_PC)' || cp $(STYLUSREADER_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(STYLUSREADER_PC)' || cp $(STYLUSREADER_PC) $(DESTDIR)$(libdir)/pkgconfig
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(STYLUSREADER_PC)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(STYLUSREADER_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(STYLUSREADER_PC))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(STYLUSREADER_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(STYLUSREADER_PC))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/StylusReader/stylusreader.pc.in paintdotnet-0.1.63/StylusReader/stylusreader.pc.in
--- paintdotnet-0.1.63.orig/StylusReader/stylusreader.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/StylusReader/stylusreader.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.StylusReader.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.StylusReader.dll
diff -ruN paintdotnet-0.1.63.orig/SystemLayer/Makefile paintdotnet-0.1.63/SystemLayer/Makefile
--- paintdotnet-0.1.63.orig/SystemLayer/Makefile 2009-03-25 08:24:14.000000000 -0700
+++ paintdotnet-0.1.63/SystemLayer/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -153,33 +153,33 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(SYSTEMLAYER_PC) $(MICROSOFT_INK_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(SYSTEMLAYER_PC)' || cp $(SYSTEMLAYER_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(SYSTEMLAYER_PC)' || cp $(SYSTEMLAYER_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(SYSTEMLAYER_PC) $(MICROSOFT_INK_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(SYSTEMLAYER_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(SYSTEMLAYER_PC))
- test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(SYSTEMLAYER_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(SYSTEMLAYER_PC))
+ test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/SystemLayer/systemlayer.pc.in paintdotnet-0.1.63/SystemLayer/systemlayer.pc.in
--- paintdotnet-0.1.63.orig/SystemLayer/systemlayer.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/SystemLayer/systemlayer.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.SystemLayer.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.SystemLayer.dll
--- NEW FILE paintdotnet.desktop ---
[Desktop Entry]
Name=Paint.NET
GenericName=Image editor
Comment=Create and edit images or photographs
Exec=paintdotnet
Icon=paintdotnet
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;RasterGraphics;
--- NEW FILE paintdotnet.spec ---
Name: paintdotnet
Version: 0.1.63
Release: 5%{?dist}
Summary: A mono port of the Paint.NET image editor
# Mono is unavailable on ppc64 prior to Fedora 11
%if 0%{?fedora} < 11
ExcludeArch: ppc64
%endif
Group: Applications/Multimedia
License: MIT and CC-BY-NC-ND
# The software is licensed as per MIT License with 3 exceptions:
# 1. The Paint.NET logo and icon artwork are Copyright Rich Brewster
# They are covered by the CC-BY-NC-ND license
# 2. Certain text and graphic resources (e.g., toolbar icon graphics,
# text for menu items and the status bar). These are collectively referred
# to as "resource assets" and are defined to include the contents of files
# installed by Paint.NET, or included in its source code distribution, that
# have a .RESOURCES, .RESX, or .PNG file extension. This also includes embedded
# resource files within the PaintDotNet.Resources.dll installed file. These
# "resource assets" are covered by the Creative Commons
# Attribution-NonCommercial-NoDerivs 2.5 license.
# 3. Although the Paint.NET source code distribution includes the GPC source
# code, use of the GPC code in any other commercial application is not
# permitted without a GPC Commercial Use Licence from The University of
# Manchester. For more information, please refer to the GPC website at:
# http://www.cs.man.ac.uk/~toby/alan/software/
# Exception 3 above does not apply here as the GPC library is not part of
# paintdotnet 3.0, packaged here
URL: http://paint-mono.googlecode.com/
Source0: http://paint-mono.googlecode.com/files/%{name}-%{version}.tar.gz
Source2: paintdotnet.desktop
# http://code.google.com/p/paint-mono/issues/detail?id=20
Patch0: paintdotnet-x64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-core desktop-file-utils ImageMagick
Requires: hicolor-icon-theme
# disabling empty mono debuginfo package
%global debug_package %{nil}
%description
Paint.NET is an image and photo editing software. It features an intuitive
and innovative user interface with support for layers, unlimited undo, special
effects, and a wide variety of useful and powerful tools. An active and growing
online community provides friendly help, tutorials, and plugins.
%package devel
Summary: Pkgconfig files for paintdotnet
Group: Development/Libraries
Requires: pkgconfig paintdotnet = %{version}-%{release}
%description devel
pkgconfig files for paintdotnet
%prep
%setup -q
%patch0 -p1 -b .x64
convert Resources/Icons/PaintDotNet.ico Resources/Icons/PaintDotNet.png
%build
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -D ./Resources/Icons/PaintDotNet-4.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/256x256/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-5.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-6.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-7.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps/paintdotnet.png
# Moving *.pc files from devel package to _libdir/pkgconfig/paintdotnet/
# Would be better if pc files where named in a less generic way
# Should addressed by upstream
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/paintdotnet
mv ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/paintdotnet/
desktop-file-install \
--vendor="" \
--add-category X-Red-Hat-Extra \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc Resources/Files/License.txt Resources/Files/AboutCredits.rtf
%{_bindir}/*
%{_libdir}/paintdotnet/
%{_datadir}/applications/paintdotnet.desktop
%{_datadir}/icons/hicolor/256x256/apps/paintdotnet.png
%{_datadir}/icons/hicolor/48x48/apps/paintdotnet.png
%{_datadir}/icons/hicolor/32x32/apps/paintdotnet.png
%{_datadir}/icons/hicolor/16x16/apps/paintdotnet.png
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/paintdotnet/
%changelog
* Wed Jun 17 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-5
- _libdir/pkgconfig/paintdotnet/ now owned by paintdotnet
* Mon Jun 15 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-4
- Moving pc files from the devel package to _libdir/pkgconfig/paintdotnet/
* Wed Jun 3 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-3
- Converting the ico file to png at build time
* Tue May 26 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-2
- Fixing spec based on package review comments
* Tue Apr 28 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-1
- update x64 build patch to upstream 0.1.63
- adding --vendor=""
* Fri Apr 17 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-0.6
- Updating to use official source tarball
- adding icon extraction script
* Wed Feb 25 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.5.63svn
- Updating desktop file for proper building on CentOS5
* Tue Feb 24 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.4.63svn
- Removing Microsoft.Ink and Interop.Wia from the source tarball
* Mon Feb 23 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.3.63svn
- Adding patch to remove Microsoft.Ink.dll and Interop.WIA.dll prior to building
* Fri Feb 20 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.2.63svn
- Adding icon cache updates
- Adding instructions to generate tarball
- Changing license from CC-BY-ND to CC-BY-NC-ND for the Paint.NET logo
* Thu Feb 12 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.1.63svn
- Initial spec
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/paintdotnet/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Jun 2009 19:09:57 -0000 1.1
+++ .cvsignore 3 Jul 2009 01:22:09 -0000 1.2
@@ -0,0 +1 @@
+paintdotnet-0.1.63.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/paintdotnet/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Jun 2009 19:09:57 -0000 1.1
+++ sources 3 Jul 2009 01:22:09 -0000 1.2
@@ -0,0 +1 @@
+dc2286789a0083499845083877fe2ab0 paintdotnet-0.1.63.tar.gz
15 years, 4 months
- 1
- 0
rpms/paintdotnet/devel paintdotnet-x64.patch, NONE, 1.1 paintdotnet.desktop, NONE, 1.1 paintdotnet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Eric Moret
Author: emoret
Update of /cvs/nonfree/rpms/paintdotnet/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11088/devel
Modified Files:
.cvsignore sources
Added Files:
paintdotnet-x64.patch paintdotnet.desktop paintdotnet.spec
Log Message:
Initial commit in devel branch
paintdotnet-x64.patch:
--- NEW FILE paintdotnet-x64.patch ---
diff -ruN paintdotnet-0.1.63.orig/configure paintdotnet-0.1.63/configure
--- paintdotnet-0.1.63.orig/configure 2009-03-25 09:08:32.000000000 -0700
+++ paintdotnet-0.1.63/configure 2009-05-03 17:55:09.000000000 -0700
@@ -2,6 +2,7 @@
VERSION=0.1
PACKAGE=paintdotnet
prefix=/usr/local
+libdir=/usr/local/lib
config=RELEASE_AND_PACKAGE_ANY_CPU
configurations=" DEBUG_ANY_CPU RELEASE_ANY_CPU RELEASE_AND_PACKAGE_ANY_CPU"
common_packages=""
@@ -9,7 +10,7 @@
usage ()
{
- echo "Usage : configure [--prefix=PREFIX] [--config=CONFIG]"
+ echo "Usage : configure [--prefix=PREFIX] [--libdir=LIBDIR] [--config=CONFIG]"
echo
echo "Configurations available :"
for c in $configurations; do
@@ -92,6 +93,13 @@
shift
prefix=$1
;;
+ --libdir=*)
+ libdir=`echo $1 | sed 's/--libdir=//'`
+ ;;
+ --libdir)
+ shift
+ libdir=$1
+ ;;
--config=*)
conf=`echo $1 | sed 's/--config=//'`
validate_config "$conf"
@@ -122,6 +130,7 @@
check_svn_revision
echo "prefix=$prefix" > config.make
+echo "libdir=$libdir" >> config.make
echo "RUNTIME=mono" >> config.make
echo "ASSEMBLY_VERSION=$VERSION.$revision.0" >> config.make
echo "VERSION=$VERSION.$revision" >> config.make
@@ -131,5 +140,6 @@
echo
echo "$PACKAGE has been configured with "
echo " prefix = $prefix"
+echo " libdir = $libdir"
echo " config = $config"
echo
diff -ruN paintdotnet-0.1.63.orig/Data/data.pc.in paintdotnet-0.1.63/Data/data.pc.in
--- paintdotnet-0.1.63.orig/Data/data.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Data/data.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Data.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Data.dll
diff -ruN paintdotnet-0.1.63.orig/Data/Makefile paintdotnet-0.1.63/Data/Makefile
--- paintdotnet-0.1.63.orig/Data/Makefile 2009-03-25 08:25:20.000000000 -0700
+++ paintdotnet-0.1.63/Data/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -195,44 +195,44 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(DATA_PC) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PDNLIB_DLL) $(MICROSOFT_INK_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(DATA_PC)' || cp $(DATA_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(DATA_PC)' || cp $(DATA_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
make post-install-local-hook prefix=$(prefix)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(DATA_PC) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PDNLIB_DLL) $(MICROSOFT_INK_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL)
make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(DATA_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(DATA_PC))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(DATA_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(DATA_PC))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
make post-uninstall-local-hook prefix=$(prefix)
install: install-local
diff -ruN paintdotnet-0.1.63.orig/Effects/effects.pc.in paintdotnet-0.1.63/Effects/effects.pc.in
--- paintdotnet-0.1.63.orig/Effects/effects.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Effects/effects.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Effects.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Effects.dll
diff -ruN paintdotnet-0.1.63.orig/Effects/Makefile paintdotnet-0.1.63/Effects/Makefile
--- paintdotnet-0.1.63.orig/Effects/Makefile 2009-03-25 08:26:01.000000000 -0700
+++ paintdotnet-0.1.63/Effects/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -243,47 +243,47 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(EFFECTS_PC) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(EFFECTS_PC)' || cp $(EFFECTS_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(EFFECTS_PC)' || cp $(EFFECTS_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(EFFECTS_PC) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(EFFECTS_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(EFFECTS_PC))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(EFFECTS_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(EFFECTS_PC))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Makefile.include paintdotnet-0.1.63/Makefile.include
--- paintdotnet-0.1.63.orig/Makefile.include 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Makefile.include 2009-05-03 17:55:09.000000000 -0700
@@ -29,9 +29,9 @@
pkglib_SCRIPTS = $(ASSEMBLY)
bin_SCRIPTS = $(BINARIES)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
@@ -54,5 +54,5 @@
test -z '$3' || chmod +x '$$@'
$2: $2.in $(top_srcdir)/config.make
- sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," < $2.in > $2
-endef
\ No newline at end of file
+ sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," -e "s,@libdir@,$(libdir)," < $2.in > $2
+endef
\ No newline at end of file
diff -ruN paintdotnet-0.1.63.orig/paintdotnet.in paintdotnet-0.1.63/paintdotnet.in
--- paintdotnet-0.1.63.orig/paintdotnet.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/paintdotnet.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/PaintDotNet.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/PaintDotNet.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/paintdotnet.make paintdotnet-0.1.63/paintdotnet.make
--- paintdotnet-0.1.63.orig/paintdotnet.make 2009-03-25 07:28:15.000000000 -0700
+++ paintdotnet-0.1.63/paintdotnet.make 2009-05-03 17:56:13.000000000 -0700
@@ -419,48 +419,48 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_EFFECTS_DLL_MDB) $(PAINTDOTNET) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_EFFECTS_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || cp $(PAINTDOTNET_EFFECTS_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || cp $(PAINTDOTNET_DATA_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || cp $(PAINTDOTNET_EFFECTS_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(PAINTDOTNET)' || cp $(PAINTDOTNET) $(DESTDIR)$(prefix)/bin
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_EFFECTS_DLL)' || cp $(PAINTDOTNET_EFFECTS_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL_MDB)' || cp $(PDNLIB_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_DATA_DLL)' || cp $(PAINTDOTNET_DATA_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PDNLIB_DLL)' || cp $(PDNLIB_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_EFFECTS_DLL)' || cp $(PAINTDOTNET_EFFECTS_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL) $(PAINTDOTNET_DATA_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_EFFECTS_DLL_MDB) $(PAINTDOTNET) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PDNLIB_DLL_MDB) $(PAINTDOTNET_DATA_DLL) $(PDNLIB_DLL) $(PAINTDOTNET_EFFECTS_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ test -z '$(PAINTDOTNET_DATA_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_EFFECTS_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL_MDB))
test -z '$(PAINTDOTNET)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(PAINTDOTNET))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
- test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
- test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
- test -z '$(PAINTDOTNET_EFFECTS_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- make post-uninstall-local-hook prefix=$(prefix)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PDNLIB_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL_MDB))
+ test -z '$(PAINTDOTNET_DATA_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_DATA_DLL))
+ test -z '$(PDNLIB_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PDNLIB_DLL))
+ test -z '$(PAINTDOTNET_EFFECTS_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_EFFECTS_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
diff -ruN paintdotnet-0.1.63.orig/PdnLib/Makefile paintdotnet-0.1.63/PdnLib/Makefile
--- paintdotnet-0.1.63.orig/PdnLib/Makefile 2009-03-25 08:26:42.000000000 -0700
+++ paintdotnet-0.1.63/PdnLib/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -268,39 +268,39 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PDNLIB_PC) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PDNLIB_PC)' || cp $(PDNLIB_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || cp $(PAINTDOTNET_RESOURCES_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PDNLIB_PC)' || cp $(PDNLIB_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || cp $(PAINTDOTNET_RESOURCES_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_RESOURCES_DLL_MDB) $(PDNLIB_PC) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_RESOURCES_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
- test -z '$(PDNLIB_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(PDNLIB_PC))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL_MDB))
+ test -z '$(PDNLIB_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(PDNLIB_PC))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_RESOURCES_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_RESOURCES_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/PdnLib/pdnlib.pc.in paintdotnet-0.1.63/PdnLib/pdnlib.pc.in
--- paintdotnet-0.1.63.orig/PdnLib/pdnlib.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/PdnLib/pdnlib.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PdnLib.dll
+Libs: -r:@libdir@/@PACKAGE@/PdnLib.dll
diff -ruN paintdotnet-0.1.63.orig/PdnRepair/Makefile paintdotnet-0.1.63/PdnRepair/Makefile
--- paintdotnet-0.1.63.orig/PdnRepair/Makefile 2009-03-25 08:04:18.000000000 -0700
+++ paintdotnet-0.1.63/PdnRepair/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -90,27 +90,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PDNREPAIR)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(PDNREPAIR)' || cp $(PDNREPAIR) $(DESTDIR)$(prefix)/bin
- make post-install-local-hook prefix=$(prefix)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PDNREPAIR)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
test -z '$(PDNREPAIR)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(PDNREPAIR))
- make post-uninstall-local-hook prefix=$(prefix)
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/PdnRepair/pdnrepair.in paintdotnet-0.1.63/PdnRepair/pdnrepair.in
--- paintdotnet-0.1.63.orig/PdnRepair/pdnrepair.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/PdnRepair/pdnrepair.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/PdnRepair.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/PdnRepair.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/Resources/Makefile paintdotnet-0.1.63/Resources/Makefile
--- paintdotnet-0.1.63.orig/Resources/Makefile 2009-03-25 08:27:14.000000000 -0700
+++ paintdotnet-0.1.63/Resources/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -333,35 +333,35 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(RESOURCES_PC) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(RESOURCES_PC)' || cp $(RESOURCES_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(RESOURCES_PC)' || cp $(RESOURCES_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || cp $(PAINTDOTNET_SYSTEMLAYER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB) $(RESOURCES_PC) $(PAINTDOTNET_SYSTEMLAYER_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
- test -z '$(RESOURCES_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(RESOURCES_PC))
- test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL_MDB))
+ test -z '$(RESOURCES_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(RESOURCES_PC))
+ test -z '$(PAINTDOTNET_SYSTEMLAYER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_SYSTEMLAYER_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Resources/resources.pc.in paintdotnet-0.1.63/Resources/resources.pc.in
--- paintdotnet-0.1.63.orig/Resources/resources.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources/resources.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.Resources.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.Resources.dll
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/custom-hooks.make paintdotnet-0.1.63/Resources.mui/custom-hooks.make
--- paintdotnet-0.1.63.orig/Resources.mui/custom-hooks.make 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/custom-hooks.make 2009-05-03 17:55:09.000000000 -0700
@@ -1,4 +1,4 @@
pre-install-local-hook:
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp PaintDotNet.Strings*.resources $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp ../bin/*/PaintDotNet.Strings.3.resources $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp PaintDotNet.Strings*.resources $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp ../bin/*/PaintDotNet.Strings.3.resources $(DESTDIR)$(libdir)/$(PACKAGE)
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/Makefile paintdotnet-0.1.63/Resources.mui/Makefile
--- paintdotnet-0.1.63.orig/Resources.mui/Makefile 2009-03-25 08:06:25.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -110,27 +110,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(RESOURCES_MUI)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
mkdir -p $(DESTDIR)$(prefix)/bin
test -z '$(RESOURCES_MUI)' || cp $(RESOURCES_MUI) $(DESTDIR)$(prefix)/bin
- make post-install-local-hook prefix=$(prefix)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(RESOURCES_MUI)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
test -z '$(RESOURCES_MUI)' || rm -f $(DESTDIR)$(prefix)/bin/$(notdir $(RESOURCES_MUI))
- make post-uninstall-local-hook prefix=$(prefix)
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/Resources.mui/resources.mui.in paintdotnet-0.1.63/Resources.mui/resources.mui.in
--- paintdotnet-0.1.63.orig/Resources.mui/resources.mui.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/Resources.mui/resources.mui.in 2009-05-03 17:55:09.000000000 -0700
@@ -1,3 +1,3 @@
#!/bin/sh
-exec mono "@prefix@/lib/@PACKAGE(a)/Resources.mui.exe" "$@"
+exec mono "@libdir@/@PACKAGE(a)/Resources.mui.exe" "$@"
diff -ruN paintdotnet-0.1.63.orig/StylusReader/Makefile paintdotnet-0.1.63/StylusReader/Makefile
--- paintdotnet-0.1.63.orig/StylusReader/Makefile 2009-03-25 08:14:44.000000000 -0700
+++ paintdotnet-0.1.63/StylusReader/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -94,27 +94,27 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(STYLUSREADER_PC)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(STYLUSREADER_PC)' || cp $(STYLUSREADER_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(STYLUSREADER_PC)' || cp $(STYLUSREADER_PC) $(DESTDIR)$(libdir)/pkgconfig
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(STYLUSREADER_PC)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(STYLUSREADER_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(STYLUSREADER_PC))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(STYLUSREADER_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(STYLUSREADER_PC))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/StylusReader/stylusreader.pc.in paintdotnet-0.1.63/StylusReader/stylusreader.pc.in
--- paintdotnet-0.1.63.orig/StylusReader/stylusreader.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/StylusReader/stylusreader.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.StylusReader.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.StylusReader.dll
diff -ruN paintdotnet-0.1.63.orig/SystemLayer/Makefile paintdotnet-0.1.63/SystemLayer/Makefile
--- paintdotnet-0.1.63.orig/SystemLayer/Makefile 2009-03-25 08:24:14.000000000 -0700
+++ paintdotnet-0.1.63/SystemLayer/Makefile 2009-05-03 17:55:09.000000000 -0700
@@ -153,33 +153,33 @@
resgen2 '$<' '$@'
$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
- make pre-all-local-hook prefix=$(prefix)
+ make pre-all-local-hook prefix=$(prefix) libdir=$(libdir)
mkdir -p $(dir $(ASSEMBLY))
make $(CONFIG)_BeforeBuild
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
make $(CONFIG)_AfterBuild
- make post-all-local-hook prefix=$(prefix)
+ make post-all-local-hook prefix=$(prefix) libdir=$(libdir)
install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(SYSTEMLAYER_PC) $(MICROSOFT_INK_DLL)
- make pre-install-local-hook prefix=$(prefix)
- mkdir -p $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(SYSTEMLAYER_PC)' || cp $(SYSTEMLAYER_PC) $(DESTDIR)$(prefix)/lib/pkgconfig
- test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(prefix)/lib/$(PACKAGE)
- make post-install-local-hook prefix=$(prefix)
+ make pre-install-local-hook prefix=$(prefix) libdir=$(libdir)
+ mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
+ cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || cp $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || cp $(PAINTDOTNET_STYLUSREADER_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(SYSTEMLAYER_PC)' || cp $(SYSTEMLAYER_PC) $(DESTDIR)$(libdir)/pkgconfig
+ test -z '$(MICROSOFT_INK_DLL)' || cp $(MICROSOFT_INK_DLL) $(DESTDIR)$(libdir)/$(PACKAGE)
+ make post-install-local-hook prefix=$(prefix) libdir=$(libdir)
uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(PAINTDOTNET_STYLUSREADER_DLL_MDB) $(PAINTDOTNET_STYLUSREADER_DLL) $(SYSTEMLAYER_PC) $(MICROSOFT_INK_DLL)
- make pre-uninstall-local-hook prefix=$(prefix)
- rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY))
- test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
- test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
- test -z '$(SYSTEMLAYER_PC)' || rm -f $(DESTDIR)$(prefix)/lib/pkgconfig/$(notdir $(SYSTEMLAYER_PC))
- test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(prefix)/lib/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
- make post-uninstall-local-hook prefix=$(prefix)
+ make pre-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
+ test -z '$(ASSEMBLY_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL_MDB)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL_MDB))
+ test -z '$(PAINTDOTNET_STYLUSREADER_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(PAINTDOTNET_STYLUSREADER_DLL))
+ test -z '$(SYSTEMLAYER_PC)' || rm -f $(DESTDIR)$(libdir)/pkgconfig/$(notdir $(SYSTEMLAYER_PC))
+ test -z '$(MICROSOFT_INK_DLL)' || rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(MICROSOFT_INK_DLL))
+ make post-uninstall-local-hook prefix=$(prefix) libdir=$(libdir)
install: install-local
uninstall: uninstall-local
diff -ruN paintdotnet-0.1.63.orig/SystemLayer/systemlayer.pc.in paintdotnet-0.1.63/SystemLayer/systemlayer.pc.in
--- paintdotnet-0.1.63.orig/SystemLayer/systemlayer.pc.in 2008-09-17 20:13:49.000000000 -0700
+++ paintdotnet-0.1.63/SystemLayer/systemlayer.pc.in 2009-05-03 17:55:09.000000000 -0700
@@ -3,4 +3,4 @@
Version: 0.1
Requires:
-Libs: -r:@prefix@/lib/@PACKAGE@/PaintDotNet.SystemLayer.dll
+Libs: -r:@libdir@/@PACKAGE@/PaintDotNet.SystemLayer.dll
--- NEW FILE paintdotnet.desktop ---
[Desktop Entry]
Name=Paint.NET
GenericName=Image editor
Comment=Create and edit images or photographs
Exec=paintdotnet
Icon=paintdotnet
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;RasterGraphics;
--- NEW FILE paintdotnet.spec ---
Name: paintdotnet
Version: 0.1.63
Release: 5%{?dist}
Summary: A mono port of the Paint.NET image editor
# Mono is unavailable on ppc64 prior to Fedora 11
%if 0%{?fedora} < 11
ExcludeArch: ppc64
%endif
Group: Applications/Multimedia
License: MIT and CC-BY-NC-ND
# The software is licensed as per MIT License with 3 exceptions:
# 1. The Paint.NET logo and icon artwork are Copyright Rich Brewster
# They are covered by the CC-BY-NC-ND license
# 2. Certain text and graphic resources (e.g., toolbar icon graphics,
# text for menu items and the status bar). These are collectively referred
# to as "resource assets" and are defined to include the contents of files
# installed by Paint.NET, or included in its source code distribution, that
# have a .RESOURCES, .RESX, or .PNG file extension. This also includes embedded
# resource files within the PaintDotNet.Resources.dll installed file. These
# "resource assets" are covered by the Creative Commons
# Attribution-NonCommercial-NoDerivs 2.5 license.
# 3. Although the Paint.NET source code distribution includes the GPC source
# code, use of the GPC code in any other commercial application is not
# permitted without a GPC Commercial Use Licence from The University of
# Manchester. For more information, please refer to the GPC website at:
# http://www.cs.man.ac.uk/~toby/alan/software/
# Exception 3 above does not apply here as the GPC library is not part of
# paintdotnet 3.0, packaged here
URL: http://paint-mono.googlecode.com/
Source0: http://paint-mono.googlecode.com/files/%{name}-%{version}.tar.gz
Source2: paintdotnet.desktop
# http://code.google.com/p/paint-mono/issues/detail?id=20
Patch0: paintdotnet-x64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-core desktop-file-utils ImageMagick
Requires: hicolor-icon-theme
# disabling empty mono debuginfo package
%global debug_package %{nil}
%description
Paint.NET is an image and photo editing software. It features an intuitive
and innovative user interface with support for layers, unlimited undo, special
effects, and a wide variety of useful and powerful tools. An active and growing
online community provides friendly help, tutorials, and plugins.
%package devel
Summary: Pkgconfig files for paintdotnet
Group: Development/Libraries
Requires: pkgconfig paintdotnet = %{version}-%{release}
%description devel
pkgconfig files for paintdotnet
%prep
%setup -q
%patch0 -p1 -b .x64
convert Resources/Icons/PaintDotNet.ico Resources/Icons/PaintDotNet.png
%build
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -D ./Resources/Icons/PaintDotNet-4.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/256x256/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-5.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-6.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/paintdotnet.png
install -D ./Resources/Icons/PaintDotNet-7.png \
${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps/paintdotnet.png
# Moving *.pc files from devel package to _libdir/pkgconfig/paintdotnet/
# Would be better if pc files where named in a less generic way
# Should addressed by upstream
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/paintdotnet
mv ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/paintdotnet/
desktop-file-install \
--vendor="" \
--add-category X-Red-Hat-Extra \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc Resources/Files/License.txt Resources/Files/AboutCredits.rtf
%{_bindir}/*
%{_libdir}/paintdotnet/
%{_datadir}/applications/paintdotnet.desktop
%{_datadir}/icons/hicolor/256x256/apps/paintdotnet.png
%{_datadir}/icons/hicolor/48x48/apps/paintdotnet.png
%{_datadir}/icons/hicolor/32x32/apps/paintdotnet.png
%{_datadir}/icons/hicolor/16x16/apps/paintdotnet.png
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/paintdotnet/
%changelog
* Wed Jun 17 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-5
- _libdir/pkgconfig/paintdotnet/ now owned by paintdotnet
* Mon Jun 15 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-4
- Moving pc files from the devel package to _libdir/pkgconfig/paintdotnet/
* Wed Jun 3 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-3
- Converting the ico file to png at build time
* Tue May 26 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-2
- Fixing spec based on package review comments
* Tue Apr 28 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-1
- update x64 build patch to upstream 0.1.63
- adding --vendor=""
* Fri Apr 17 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1.63-0.6
- Updating to use official source tarball
- adding icon extraction script
* Wed Feb 25 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.5.63svn
- Updating desktop file for proper building on CentOS5
* Tue Feb 24 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.4.63svn
- Removing Microsoft.Ink and Interop.Wia from the source tarball
* Mon Feb 23 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.3.63svn
- Adding patch to remove Microsoft.Ink.dll and Interop.WIA.dll prior to building
* Fri Feb 20 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.2.63svn
- Adding icon cache updates
- Adding instructions to generate tarball
- Changing license from CC-BY-ND to CC-BY-NC-ND for the Paint.NET logo
* Thu Feb 12 2009 - Eric Moret <eric.moret(a)gmail.com> - 0.1-0.1.63svn
- Initial spec
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/paintdotnet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Jun 2009 19:09:57 -0000 1.1
+++ .cvsignore 3 Jul 2009 01:18:18 -0000 1.2
@@ -0,0 +1 @@
+paintdotnet-0.1.63.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/paintdotnet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Jun 2009 19:09:57 -0000 1.1
+++ sources 3 Jul 2009 01:18:18 -0000 1.2
@@ -0,0 +1 @@
+dc2286789a0083499845083877fe2ab0 paintdotnet-0.1.63.tar.gz
15 years, 4 months
- 1
- 0
rpms/sdlmame/F-11 sources,1.47,1.48
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3595
Modified Files:
sources
Log Message:
Uploaded fixed source
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 2 Jul 2009 16:13:11 -0000 1.47
+++ sources 2 Jul 2009 23:04:37 -0000 1.48
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-89f3741d3e683c9694c42cb8f3b04d93 sdlmame0132u3.zip
+e8aca47128d06a7c7f8afd906f60cd6e sdlmame0132u3.zip
15 years, 4 months
- 1
- 0
rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.26, 1.27
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16839
Modified Files:
xine-lib-extras-freeworld.spec
Log Message:
* Thu Jul 02 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16.3-2
- rebuild (DirectFB)
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xine-lib-extras-freeworld.spec 3 Apr 2009 17:30:52 -0000 1.26
+++ xine-lib-extras-freeworld.spec 2 Jul 2009 17:22:18 -0000 1.27
@@ -11,7 +11,7 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -187,6 +187,9 @@
%changelog
+* Thu Jul 02 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16.3-2
+- rebuild (DirectFB)
+
* Fri Apr 03 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26
15 years, 4 months
- 1
- 0
rpms/sdlmame/F-10 .cvsignore, 1.47, 1.48 sdlmame.spec, 1.56, 1.57 sources, 1.48, 1.49
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12392
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
- Updated to 0.132u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 26 Jun 2009 01:02:32 -0000 1.47
+++ .cvsignore 2 Jul 2009 16:13:23 -0000 1.48
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0132u2.zip
+sdlmame0132u3.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sdlmame.spec 26 Jun 2009 01:02:32 -0000 1.56
+++ sdlmame.spec 2 Jul 2009 16:13:23 -0000 1.57
@@ -1,4 +1,4 @@
-%define beta 0132u2
+%define beta 0132u3
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0133
-Release: 0.2.%{?beta}%{?dist}
+Release: 0.3.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
+- Updated to 0.132u3
+
* Fri Jun 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.2.0132u2
- Updated to 0.132u2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources 26 Jun 2009 01:02:32 -0000 1.48
+++ sources 2 Jul 2009 16:13:23 -0000 1.49
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-1688535a1d65cceced132a13ed4446a0 sdlmame0132u2.zip
+89f3741d3e683c9694c42cb8f3b04d93 sdlmame0132u3.zip
15 years, 4 months
- 1
- 0
rpms/sdlmame/F-11 .cvsignore, 1.45, 1.46 sdlmame.spec, 1.54, 1.55 sources, 1.46, 1.47
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12291
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
- Updated to 0.132u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 26 Jun 2009 01:02:20 -0000 1.45
+++ .cvsignore 2 Jul 2009 16:13:11 -0000 1.46
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0132u2.zip
+sdlmame0132u3.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sdlmame.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sdlmame.spec 26 Jun 2009 01:02:20 -0000 1.54
+++ sdlmame.spec 2 Jul 2009 16:13:11 -0000 1.55
@@ -1,4 +1,4 @@
-%define beta 0132u2
+%define beta 0132u3
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0133
-Release: 0.2.%{?beta}%{?dist}
+Release: 0.3.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
+- Updated to 0.132u3
+
* Fri Jun 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.2.0132u2
- Updated to 0.132u2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 26 Jun 2009 01:02:20 -0000 1.46
+++ sources 2 Jul 2009 16:13:11 -0000 1.47
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-1688535a1d65cceced132a13ed4446a0 sdlmame0132u2.zip
+89f3741d3e683c9694c42cb8f3b04d93 sdlmame0132u3.zip
15 years, 4 months
- 1
- 0