Rename build directories to remove potential conflicts

.Rbuildignore

@@ -13,3 +13,5 @@
 ^\.vscode$
 ^\.claude$
 ^CLAUDE.md$
+^w-build$
+^w-install$

.gitignore

@@ -2,8 +2,8 @@
 .Rhistory
 .RData
 .Ruserdata
-/build/
-/install/
+/w-build/
+/w-install/
 /docs/
 /revdep/
 /.claude/

cleanup

@@ -1,2 +1,2 @@
 #!/bin/sh
-rm -rf src/Makevars build install
+rm -rf src/Makevars w-build w-install

cleanup.win

@@ -1 +1 @@
-rm -rf src/Makevars build install
+rm -rf src/Makevars w-build w-install

configure

@@ -97,23 +97,23 @@ fi
 if [ $compile_fswatch -eq 1 ]; then
   echo "Compiling 'libfswatch' from source ..."
   detect_cmake
-  cmake -S src/fswatch -B build \
-    -DCMAKE_INSTALL_PREFIX=install \
+  cmake -S src/fswatch -B w-build \
+    -DCMAKE_INSTALL_PREFIX=w-install \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
     -DCMAKE_COLOR_MAKEFILE=0 \
     -DCMAKE_INSTALL_MESSAGE=NEVER \
     -DBUILD_LIBS_ONLY=1 \
     -DUSE_NLS=0
-  cmake --build build --target install
-  rm -rf build
+  cmake --build w-build --target install
+  rm -rf w-build
 fi
 
 # Set flags for bundled library
-if [ -d "install/lib" ]; then
-  PKG_CFLAGS="-I../install/include $PKG_CFLAGS"
-  PKG_LIBS="../install/lib/libfswatch.a $PKG_LIBS"
+if [ -d "w-install/lib" ]; then
+  PKG_CFLAGS="-I../w-install/include $PKG_CFLAGS"
+  PKG_LIBS="../w-install/lib/libfswatch.a $PKG_LIBS"
 fi
 
 # Write to Makevars

configure.ucrt

@@ -6,17 +6,17 @@ LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
 export CC CFLAGS CPPFLAGS LDFLAGS
 
 echo "Compiling 'libfswatch' from source ..."
-cmake -S src/fswatch -B build -G "Unix Makefiles" \
-  -DCMAKE_INSTALL_PREFIX=install \
+cmake -S src/fswatch -B w-build -G "Unix Makefiles" \
+  -DCMAKE_INSTALL_PREFIX=w-install \
   -DCMAKE_INSTALL_LIBDIR=lib \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
   -DCMAKE_COLOR_MAKEFILE=0 \
   -DCMAKE_INSTALL_MESSAGE=NEVER \
   -DBUILD_LIBS_ONLY=1 \
   -DUSE_NLS=0
-cmake --build build --target install
-rm -rf build
+cmake --build w-build --target install
+rm -rf w-build
 
 # Success
 exit 0

configure.win

@@ -8,17 +8,17 @@ for ARCH in x64 i386; do
     export CC CFLAGS CPPFLAGS LDFLAGS
 
     echo "Compiling 'libfswatch' from source for ${ARCH} ..."
-    cmake -S src/fswatch -B build -G "Unix Makefiles" \
-      -DCMAKE_INSTALL_PREFIX=install/${ARCH} \
+    cmake -S src/fswatch -B w-build -G "Unix Makefiles" \
+      -DCMAKE_INSTALL_PREFIX=w-install/${ARCH} \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
       -DCMAKE_COLOR_MAKEFILE=0 \
       -DCMAKE_INSTALL_MESSAGE=NEVER \
       -DBUILD_LIBS_ONLY=1 \
       -DUSE_NLS=0
-    cmake --build build --target install
-    rm -rf build
+    cmake --build w-build --target install
+    rm -rf w-build
 
   else
   echo "Note: ${ARCH} not installed, skipping ..."

src/Makevars.in

@@ -4,12 +4,12 @@ PKG_LIBS = @libs@
 SOURCES = init.c watcher.c
 OBJECTS = $(SOURCES:.c=.o)
 
-.PHONY: all clean-archives clean
+.PHONY: all cleanup clean
 
-all: clean-archives
+all: cleanup
 
-clean-archives: $(SHLIB)
-	@rm -f ../install/lib/*.a
+cleanup: $(SHLIB)
+	@rm -rf ../w-install
 
 $(SHLIB): $(OBJECTS)
 

src/Makevars.ucrt

@@ -1,15 +1,15 @@
-PKG_CFLAGS = -I../install/include $(C_VISIBILITY)
-PKG_LIBS = ../install/lib/libfswatch.a -pthread
+PKG_CFLAGS = -I../w-install/include $(C_VISIBILITY)
+PKG_LIBS = ../w-install/lib/libfswatch.a -pthread
 
 SOURCES = init.c watcher.c
 OBJECTS = $(SOURCES:.c=.o)
 
-.PHONY: all clean-archives clean
+.PHONY: all cleaup clean
 
-all: clean-archives
+all: cleanup
 
-clean-archives: $(SHLIB)
-	@rm -f ../install/lib/*.a
+cleanup: $(SHLIB)
+	@rm -rf ../w-install
 
 $(SHLIB): $(OBJECTS)
 

src/Makevars.win

@@ -1,15 +1,15 @@
-PKG_CFLAGS = -I../install${R_ARCH}/include $(C_VISIBILITY)
-PKG_LIBS = ../install${R_ARCH}/lib/libfswatch.a -pthread -lstdc++fs
+PKG_CFLAGS = -I../w-install${R_ARCH}/include $(C_VISIBILITY)
+PKG_LIBS = ../w-install${R_ARCH}/lib/libfswatch.a -pthread -lstdc++fs
 
 SOURCES = init.c watcher.c
 OBJECTS = $(SOURCES:.c=.o)
 
-.PHONY: all clean-archives clean
+.PHONY: all cleanup clean
 
-all: clean-archives
+all: cleanup
 
-clean-archives: $(SHLIB)
-	@rm -f ../install${R_ARCH}/lib/*.a
+cleanup: $(SHLIB)
+	@rm -rf ../w-install${R_ARCH}
 
 $(SHLIB): $(OBJECTS)