revert Makefile

Bears-R-Us · Jan 7, 2025 · 23d94d1 · 23d94d1
1 parent 7a37f82
commit 23d94d1
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -198,11 +198,7 @@ ARROW_DEPENDENCY_SOURCE := BUNDLED
 install-arrow:
 	@echo "Installing Apache Arrow/Parquet"
 	@echo "from build directory: ${DEP_BUILD_DIR}"
-	#   if not root, use sudo
-    ifneq ($(shell id -u), 0)
-		$(eval SUDO := sudo)
-    endif
-	$(SUDO) rm -rf $(ARROW_INSTALL_DIR)
+	rm -rf $(ARROW_INSTALL_DIR)
 	mkdir -p $(DEP_INSTALL_DIR) $(DEP_BUILD_DIR)
 	touch $(DEP_BUILD_DIR)/arrow_exports.sh
 
@@ -221,24 +217,18 @@ install-arrow:
 		cd $(ARROW_BUILD_DIR)/cpp/thirdparty/ && ./download_dependencies.sh $(ARROW_DEP_DIR) > $(DEP_BUILD_DIR)/arrow_exports.sh
     endif
 
-	cd $(DEP_BUILD_DIR) && . ./arrow_exports.sh && cd $(ARROW_BUILD_DIR)/cpp/build-release && $(SUDO) cmake -S $(ARROW_BUILD_DIR)/cpp .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=$(ARROW_INSTALL_DIR) -DCMAKE_BUILD_TYPE=Release -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON -DARROW_WITH_BROTLI=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_LZ4=ON -DARROW_WITH_ZLIB=ON -DARROW_WITH_ZSTD=ON -DARROW_DEPENDENCY_SOURCE=$(ARROW_DEPENDENCY_SOURCE) $(ARROW_OPTIONS) && $(SUDO) make -j$(NUM_CORES)
+	cd $(DEP_BUILD_DIR) && . ./arrow_exports.sh && cd $(ARROW_BUILD_DIR)/cpp/build-release && cmake -S $(ARROW_BUILD_DIR)/cpp .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=$(ARROW_INSTALL_DIR) -DCMAKE_BUILD_TYPE=Release -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON -DARROW_WITH_BROTLI=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_LZ4=ON -DARROW_WITH_ZLIB=ON -DARROW_WITH_ZSTD=ON -DARROW_DEPENDENCY_SOURCE=$(ARROW_DEPENDENCY_SOURCE) $(ARROW_OPTIONS) && make -j$(NUM_CORES)
 
-	cd $(ARROW_BUILD_DIR)/cpp/build-release && $(SUDO) make install
+	cd $(ARROW_BUILD_DIR)/cpp/build-release && make install
 
 	echo '$$(eval $$(call add-path,$(ARROW_INSTALL_DIR)))' >> Makefile.paths   
 
 
 arrow-clean:
-    #   If not root, use sudo
-    ifneq ($(shell id -u), 0)
-		$(eval SUDO := sudo)
-    endif 
-
-	$(SUDO) rm -rf $(DEP_BUILD_DIR)/apache-arrow*
-	$(SUDO) rm -rf $(DEP_BUILD_DIR)/arrow-apache-arrow*	
-	$(SUDO) rm -rf $(ARROW_DEP_DIR)
-	$(SUDO) rm -fr $(DEP_BUILD_DIR)/arrow_exports.sh
-
+	rm -rf $(DEP_BUILD_DIR)/apache-arrow*
+	rm -rf $(DEP_BUILD_DIR)/arrow-apache-arrow*	
+	rm -rf $(ARROW_DEP_DIR)
+	rm -fr $(DEP_BUILD_DIR)/arrow_exports.sh
 
 
 ICONV_VER := 1.17