Changeset d979a96 in freewrt

Timestamp:

Jan 28, 2007, 6:38:31 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

45c2d26

Parents:

fe8c8c9

Message:

• pkg-bottom.mk: use single quotes, not double quotes, for the text, as we don't use shell variables inside
• package.mk: it's not enough to check for /lib/* stuff in ${WRKINST}, we must also check for it in ${IDIR_*} if we want to prevent certain overwrite-and-delete scenarios…

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1791 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

mk

Files:

• package.mk (modified) (1 diff)
• pkg-bottom.mk (modified) (1 diff)

mk/package.mk

@@ -81 +81 @@
         @rm -f '$${STAGING_DIR}/pkg/$(1)'
         @cd $${IDIR_$(1)}; \
-            find lib usr ! -type d 2>/dev/null | \
+            find lib \( -name lib\*.so\* -o -name lib\*.a \) \
+                -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \
+                " fix this!" >&2 \; -quit 2>/dev/null; \
+            find usr ! -type d 2>/dev/null | \
             grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
             tee '$${STAGING_DIR}/pkg/$(1)' | \

mk/pkg-bottom.mk

@@ -125 +125 @@
         @cd ${WRKINST}; \
             find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-                -exec echo "WARNING: ${PKG_NAME} installs files in /lib - fix this!" >&2 \
-                \; -quit 2>/dev/null; \
+                -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
+                ' fix this!" >&2 \; -quit 2>/dev/null; \
             find usr ! -type d 2>/dev/null | \
             grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \