diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-09-10 22:22:03 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-22 12:36:18 +0200 |
| commit | 500ff01893ef20356590bd2bfd71f2059bebc12e (patch) | |
| tree | 6a13eb09dd819828ad260674ba24514768ebabd9 /rules/poppler.make | |
| parent | 5037f77d2cadf1d8b864b5637a0c58a9fd16be58 (diff) | |
| download | ptxdist-500ff01893ef20356590bd2bfd71f2059bebc12e.tar.gz ptxdist-500ff01893ef20356590bd2bfd71f2059bebc12e.tar.xz | |
[poppler] targetinstall consolidation
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/poppler.make')
| -rw-r--r-- | rules/poppler.make | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/rules/poppler.make b/rules/poppler.make index 624d99de1..32d205894 100644 --- a/rules/poppler.make +++ b/rules/poppler.make @@ -100,15 +100,13 @@ endif $(STATEDIR)/poppler.targetinstall: @$(call targetinfo) - @$(call install_init, poppler) + @$(call install_init, poppler) @$(call install_fixup, poppler, PRIORITY, optional) @$(call install_fixup, poppler, SECTION, base) @$(call install_fixup, poppler, AUTHOR, "r.schwebel@pengutronix.de") @$(call install_fixup, poppler, DESCRIPTION, missing) - @$(call install_copy, poppler, 0, 0, 0644, -, /usr/lib/libpoppler.so.4.0.0) - @$(call install_link, poppler, libpoppler.so.4.0.0, /usr/lib/libpoppler.so.4) - @$(call install_link, poppler, libpoppler.so.4.0.0, /usr/lib/libpoppler.so) + @$(call install_lib, poppler, 0, 0, 0644, libpoppler) ifdef PTXCONF_POPPLER_BIN @cd $(PKGDIR)/$(POPPLER)/usr/bin/ && \ @@ -116,13 +114,9 @@ ifdef PTXCONF_POPPLER_BIN $(call install_copy, poppler, 0, 0, 0755, -, /usr/bin/$$i); \ done endif - ifdef PTXCONF_POPPLER_GLIB - @$(call install_copy, poppler, 0, 0, 0644, -, /usr/lib/libpoppler-glib.so.4.0.0) - @$(call install_link, poppler, libpoppler-glib.so.4.0.0, /usr/lib/libpoppler-glib.so.4) - @$(call install_link, poppler, libpoppler-glib.so.4.0.0, /usr/lib/libpoppler-glib.so) + @$(call install_lib, poppler, 0, 0, 0644, libpoppler-glib) endif - @$(call install_finish, poppler) @$(call touch) |