Simplify configure and update bundle (#17)

Author: shikokuchuo

configure

@@ -5,7 +5,7 @@ LIB_VER="5c443d2"
 
 # Initialise
 PKG_CFLAGS=""
-PKG_LIBS="-lfswatch -lpthread"
+PKG_LIBS="-lpthread"
 
 # Find compiler and export flags
 CC=`"${R_HOME}/bin/R" CMD config CC`
@@ -34,23 +34,23 @@ if [ -z "$WATCHER_LIBS" ]; then
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]
 then
   PKG_CFLAGS="-I$INCLUDE_DIR $PKG_CFLAGS"
-  PKG_LIBS="-L$LIB_DIR $PKG_LIBS"
+  PKG_LIBS="-L$LIB_DIR -lfswatch $PKG_LIBS"
   echo "Found INCLUDE_DIR $INCLUDE_DIR"
   echo "Found LIB_DIR $LIB_DIR"
-elif [ -d "/usr/local/include/libfswatch" ]
+elif [ -d "/usr/local/include/libfswatch1" ]
 then
   PKG_CFLAGS="-I/usr/local/include $PKG_CFLAGS"
-  PKG_LIBS="-L/usr/local/lib $PKG_LIBS"
+  PKG_LIBS="-L/usr/local/lib -lfswatch $PKG_LIBS"
   echo "Found 'libfswatch' $PKG_CFLAGS"
 elif [ -d "/usr/include/libfswatch" ]
 then
   PKG_CFLAGS="-I/usr/include $PKG_CFLAGS"
-  PKG_LIBS="-L/usr/lib $PKG_LIBS"
+  PKG_LIBS="-L/usr/lib -lfswatch $PKG_LIBS"
   echo "Found 'libfswatch' $PKG_CFLAGS"
 elif [ -d "/usr/local/opt/libfswatch" ]
 then
   PKG_CFLAGS="-I/usr/local/opt/fswatch/include $PKG_CFLAGS"
-  PKG_LIBS="-L/usr/local/opt/fswatch/lib $PKG_LIBS"
+  PKG_LIBS="-L/usr/local/opt/fswatch/lib -lfswatch $PKG_LIBS"
   echo "Found 'libfswatch' $PKG_CFLAGS"
 else
   echo "Existing 'libfswatch' not found"
@@ -76,22 +76,18 @@ if [ -z "$PKG_CFLAGS" ]; then
   fi
   gzip -dc src/fswatch-$LIB_VER.tar.gz | tar -xf -
   cd fswatch-$LIB_VER
-  cmake -DCMAKE_INSTALL_PREFIX=../install \
+  cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_LIBDIR=lib \
   -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
   -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
   -DCMAKE_BUILD_TYPE=Release .
   cmake --build . --target install
   cd ..
   rm -rf fswatch-$LIB_VER
 
-  if [ -d "install/lib64" ]
+  if [ -d "install/lib" ]
   then
   PKG_CFLAGS="-I../install/include $PKG_CFLAGS"
-  PKG_LIBS="-L../install/lib64 $PKG_LIBS"
-  elif [ -d "install/lib" ]
-  then
-  PKG_CFLAGS="-I../install/include $PKG_CFLAGS"
-  PKG_LIBS="-L../install/lib $PKG_LIBS"
+  PKG_LIBS="../install/lib/libfswatch.b $PKG_LIBS"
   fi
 fi
 

src/Makevars.ucrt

@@ -1,2 +1,2 @@
 PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
-PKG_LIBS=-L../install/lib -lfswatch -pthread
+PKG_LIBS=../install/lib/libfswatch.b -pthread

src/Makevars.win

@@ -1,2 +1,2 @@
 PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
-PKG_LIBS=-L../install/lib -lfswatch -pthread -lstdc++fs
+PKG_LIBS=../install/lib/libfswatch.b -pthread -lstdc++fs